--- trunk/xvidcore/vfw/src/resource.rc 2004/07/18 12:45:57 1510 +++ trunk/xvidcore/vfw/src/resource.rc 2005/10/05 11:20:22 1643 @@ -7,14 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#ifdef _MSC_VER -#include "afxres.h" -#else #include #ifndef IDC_STATIC #define IDC_STATIC (-1) #endif -#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -66,8 +62,6 @@ WS_TABSTOP,143,65,43,10 EDITTEXT IDC_FRAMEDROP,112,96,75,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_MAXKEY,112,116,76,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Cartoon Mode",IDC_CARTOON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,143,61,10 LTEXT "Motion search precision:",IDC_STATIC,14,20,80,12, SS_CENTERIMAGE LTEXT "VHQ mode:",IDC_STATIC,14,39,38,8 @@ -76,7 +70,7 @@ LTEXT "Maximum I-frame interval:",IDC_STATIC,14,117,80,12, SS_CENTERIMAGE GROUPBOX "Motion Precision",IDC_STATIC,7,7,193,77 - GROUPBOX "Other",IDC_STATIC,7,79,193,84 + GROUPBOX "Other",IDC_STATIC,7,79,193,67 CONTROL "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,52,95,10 END @@ -86,7 +80,7 @@ CAPTION "XviD Configuration" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - COMBOBOX IDC_PROFILE,88,16,91,76,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_PROFILE,88,16,91,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "more...",IDC_PROFILE_ADV,184,16,28,12 COMBOBOX IDC_MODE,88,34,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | @@ -498,9 +492,10 @@ CONTROL "IDB_LOGO",IDC_STATIC,"Static",SS_BITMAP,24,56,15,13 CTEXT "XviD MPEG4 video codec",IDC_STATIC,8,16,176,12 GROUPBOX "About",IDC_STATIC,4,4,184,132 - DEFPUSHBUTTON "OK",IDOK,56,144,80,12 + DEFPUSHBUTTON "OK",IDOK,102,144,80,14 CTEXT "CORE",IDC_CORE,8,40,176,8,SS_CENTERIMAGE CTEXT "( SPECIAL BUILD )",IDC_SPECIAL_BUILD,5,102,181,8 + PUSHBUTTON "View License...",IDC_LICENSE,10,144,80,14 END IDD_RC_CBR DIALOG DISCARDABLE 0, 0, 212, 212 @@ -526,21 +521,19 @@ BEGIN GROUPBOX "",IDC_STATIC,8,120,196,86 LTEXT "Profile @ Level:",IDC_STATIC,8,10,52,8 - COMBOBOX IDC_PROFILE_PROFILE,84,8,116,76,CBS_DROPDOWNLIST | + COMBOBOX IDC_PROFILE_PROFILE,84,8,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_QUANTTYPE,120,28,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_QUANTTYPE,111,32,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Edit Matrix...",IDC_QUANTMATRIX,120,43,76,12 + PUSHBUTTON "Edit Matrix...",IDC_QUANTMATRIX,111,47,76,12 CONTROL "Adaptive Quantization",IDC_LUMMASK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,50,85,10 + BS_AUTOCHECKBOX | WS_TABSTOP,16,56,85,10 CONTROL "Interlaced Encoding",IDC_INTERLACING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,64,100,8 + BS_AUTOCHECKBOX | WS_TABSTOP,16,72,79,8 CONTROL "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,78,100,8 + WS_TABSTOP,16,88,100,8 CONTROL "Global Motion Compensation",IDC_GMC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,92,103,8 - CONTROL "Reduced Resolution",IDC_REDUCED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,106,100,8 + BS_AUTOCHECKBOX | WS_TABSTOP,16,104,103,8 CONTROL "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 16,120,40,8 LTEXT "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,136,96,8 @@ -549,13 +542,11 @@ EDITTEXT IDC_BQUANTOFFSET,120,161,76,12,ES_AUTOHSCROLL CONTROL "Packed bitstream",IDC_PACKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,182,71,10 - CONTROL "Closed GOV",IDC_CLOSEDGOV,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,112,182,55,10 LTEXT "Quantizer ratio:",IDC_BQUANTRATIO_S,16,150,89,8 LTEXT "Quantizer offset:",IDC_BQUANTOFFSET_S,16,164,52,8 - LTEXT "Quantization type:",IDC_QUANTTYPE_S,16,32,100,8 + LTEXT "Quantization type:",IDC_QUANTTYPE_S,16,36,85,8 CONTROL "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,119,62,56,10 + WS_TABSTOP,100,72,56,10 END IDD_ZONE DIALOG DISCARDABLE 0, 0, 212, 194 @@ -586,6 +577,8 @@ RTEXT "X",IDC_ZONE_MAX,140,74,54,8 LTEXT "X",IDC_ZONE_MIN,18,74,54,8 GROUPBOX "Static",IDC_STATIC,7,107,198,80 + CONTROL "Cartoon Mode",IDC_CARTOON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,121,124,61,10 END IDD_LEVEL DIALOG DISCARDABLE 0, 0, 212, 215 @@ -593,28 +586,38 @@ CAPTION "Level" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_LEVEL_PROFILE,84,8,116,76,CBS_DROPDOWNLIST | + COMBOBOX IDC_LEVEL_PROFILE,84,8,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_LEVEL_WIDTH,88,39,28,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_HEIGHT,128,39,28,12,ES_AUTOHSCROLL | + EDITTEXT IDC_LEVEL_WIDTH,88,43,28,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_HEIGHT,128,43,28,12,ES_AUTOHSCROLL | + ES_READONLY + EDITTEXT IDC_LEVEL_FPS,168,43,28,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_VMV,156,60,40,12,ES_RIGHT | ES_AUTOHSCROLL | + ES_READONLY + EDITTEXT IDC_LEVEL_VCV,156,77,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_FPS,168,39,28,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VMV,156,57,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VCV,156,73,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VBV,156,89,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_BITRATE,156,105,40,12,ES_AUTOHSCROLL | + EDITTEXT IDC_LEVEL_VBV,156,115,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_BITRATE,156,131,40,12,ES_RIGHT | + ES_AUTOHSCROLL | ES_READONLY LTEXT "Profile @ Level:",IDC_STATIC,8,10,52,8 - GROUPBOX "Level",IDC_STATIC,8,28,196,96 - LTEXT "Suggested:",IDC_STATIC,16,41,48,8 - LTEXT "x",IDC_STATIC,120,41,8,8 - LTEXT "Max bitrate (kbps)",IDC_STATIC,16,105,108,8 - LTEXT "Max buffer size (bits):",IDC_STATIC,16,89,108,8 - LTEXT "Max processing rate (mbs/sec)",IDC_STATIC,16,73,108,8 - LTEXT "Max frame size (mbs):",IDC_STATIC,16,57,108,8 - LTEXT "x",IDC_STATIC,160,41,8,8 - CTEXT "\n\nThis is informative only.\n\nXviD's ratecontrol will not respect these values.", - IDC_STATIC,8,128,196,80 + GROUPBOX "Level - XviD will not force you to respect these", + IDC_LEVEL_LEVEL_G,8,28,196,66 + LTEXT "Suggested:",IDC_LEVEL_DIM_S,16,45,48,8 + LTEXT "x",IDC_STATIC,120,45,8,8 + LTEXT "Max bitrate (kbps)",IDC_LEVEL_BITRATE_S,16,133,108,8 + LTEXT "Max buffer size (bits):",IDC_LEVEL_VBV_S,16,117,108,8 + LTEXT "Max processing rate (mbs/sec)",IDC_LEVEL_VCV_S,16,79, + 108,8 + LTEXT "Max frame size (macroblocks):",IDC_LEVEL_VMV_S,16,63, + 108,8 + LTEXT "x",IDC_STATIC,160,45,8,8 + GROUPBOX "Video Buffer Verifier - used in Two-Pass mode", + IDC_LEVEL_VBV_G,8,100,196,66 + EDITTEXT IDC_LEVEL_PEAKRATE,156,148,40,12,ES_RIGHT | + ES_AUTOHSCROLL | ES_READONLY + LTEXT "Max bits over any one second interval:", + IDC_LEVEL_PEAKRATE_S,16,150,128,8 END IDD_DEC DIALOG DISCARDABLE 0, 0, 212, 212 @@ -770,7 +773,7 @@ IDD_AR DIALOGEX 0, 0, 211, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Aspect Ratio" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Pixel Aspect Ratio",IDC_PAR,"Button",BS_AUTORADIOBUTTON, 13,7,73,10,WS_EX_TRANSPARENT @@ -779,7 +782,7 @@ EDITTEXT IDC_PARX,39,58,36,12,ES_NUMBER EDITTEXT IDC_PARY,100,58,36,12,ES_NUMBER PUSHBUTTON "Default",IDC_AR_DEFAULT,156,21,37,11 - CONTROL "Picture Aspect Ratio",IDC_AR,"Button", + CONTROL "Display Aspect Ratio",IDC_AR,"Button", BS_AUTORADIOBUTTON,13,81,81,10,WS_EX_TRANSPARENT EDITTEXT IDC_ARX,39,110,36,12,ES_NUMBER EDITTEXT IDC_ARY,100,110,36,12,ES_NUMBER @@ -831,8 +834,8 @@ WS_TABSTOP EDITTEXT IDC_BITRATE_ASIZE,95,188,75,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BITRATE_ASELECT,178,188,20,12 - CONTROL "Average bitrate:",IDC_BITRATE_AMODE_RATE,"Button", - BS_AUTORADIOBUTTON,15,175,66,10 + CONTROL "Avg. bitrate (kbps):",IDC_BITRATE_AMODE_RATE,"Button", + BS_AUTORADIOBUTTON,15,175,75,10 GROUPBOX "Video",IDC_STATIC,5,75,200,132 GROUPBOX "Audio",IDC_STATIC,5,148,200,59 CONTROL "Size (kbytes):",IDC_BITRATE_AMODE_SIZE,"Button", @@ -845,7 +848,8 @@ GROUPBOX "Container:",IDC_STATIC,5,35,200,172 LTEXT "Overhead (kbytes):",IDC_STATIC,15,61,61,10, SS_CENTERIMAGE - LTEXT "Average bitrate:",IDC_STATIC,15,136,51,8,SS_CENTERIMAGE + LTEXT "Average bitrate (kbps):",IDC_STATIC,15,136,72,8, + SS_CENTERIMAGE CTEXT "hours",IDC_STATIC,15,90,30,8 CTEXT "minutes",IDC_STATIC,52,90,30,8 CTEXT "seconds",IDC_STATIC,88,90,30,8 @@ -854,6 +858,16 @@ SS_CENTERIMAGE END +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 430, 234 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "OK",IDOK,172,218,84,14 + EDITTEXT IDC_LICENSE_TEXT,2,2,426,212,ES_MULTILINE | + ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL +END + ///////////////////////////////////////////////////////////////////////////// // @@ -873,6 +887,42 @@ ///////////////////////////////////////////////////////////////////////////// // +// TEXT +// + +IDR_GPL TEXT DISCARDABLE "../LICENSE" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include \r\n" + "#ifndef IDC_STATIC\r\n" + "#define IDC_STATIC (-1)\r\n" + "#endif\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// // String Table // @@ -968,7 +1018,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDC_PROFILE_PROFILE "Restrict the usage of MPEG-4 tools and limit the encoded bitrate such that bitstreams are compatible with hardware decoders." + IDC_PROFILE_PROFILE "Restrict the usage of MPEG-4 tools and limit the encoded bitrate such that bitstreams are compatible with hardware decoders.\n\nWhen a DXN profile is selected, the following constraints take effect:\n* force 1:1 picture aspect ratio\n* disable bvops if interlaced encoding is enabled\n* force a maximum of 1 consecutive bvop for the portable and HT profiles, and a maximum of 2 consecutive bvops for the HD profile\n* always write divx5 user data string into the bitstream\n* force packed bitstream" IDC_BVOP_THRESHOLD "Change the amount of b-frames in this zone. Recommended values are between -20 (almost no b-vops) and 30 (many b-vops).\nThe hardcoded maximum in profile/level will never be exceeded" END @@ -1018,44 +1068,6 @@ ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// Englisch (Australien) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Englisch (Australien) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED /////////////////////////////////////////////////////////////////////////////