--- trunk/xvidcore/vfw/src/resource.rc 2004/11/22 10:40:03 1562 +++ trunk/xvidcore/vfw/src/resource.rc 2005/03/27 03:59:42 1607 @@ -62,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 @@ -72,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 @@ -80,9 +78,9 @@ IDD_MAIN DIALOGEX 0, 0, 225, 255 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "XviD Configuration" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 +FONT 8, "MS Shell Dlg" 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 | @@ -523,22 +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 | NOT WS_VISIBLE | 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 @@ -547,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 @@ -584,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 @@ -591,29 +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,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_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VCV,156,77,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VBV,156,115,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_BITRATE,156,131,40,12,ES_AUTOHSCROLL | + 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_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 - XviD will not force you to respect these", - IDC_STATIC,8,28,196,66 - LTEXT "Suggested:",IDC_STATIC,16,45,48,8 + 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_STATIC,16,133,108,8 - LTEXT "Max buffer size (bits):",IDC_STATIC,16,117,108,8 - LTEXT "Max processing rate (mbs/sec)",IDC_STATIC,16,79,108,8 - LTEXT "Max frame size (macroblocks):",IDC_STATIC,16,63,108,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_STATIC,8,100,196,49 + 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 @@ -858,7 +862,7 @@ CAPTION "GNU General Public License" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Dismiss",IDOK,172,218,84,14 + PUSHBUTTON "OK",IDOK,172,218,84,14 EDITTEXT IDC_LICENSE_TEXT,2,2,426,212,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END @@ -885,7 +889,7 @@ // TEXT // -IDR_GPL TEXT DISCARDABLE "../../LICENSE" +IDR_GPL TEXT DISCARDABLE "../LICENSE" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -1013,7 +1017,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