--- trunk/xvidcore/vfw/src/resource.rc 2005/01/10 05:01:01 1592 +++ trunk/xvidcore/vfw/src/resource.rc 2005/10/05 11:20:22 1643 @@ -80,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 | @@ -521,7 +521,7 @@ 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,111,32,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -586,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 @@ -764,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 @@ -773,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 @@ -825,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", @@ -839,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 @@ -853,7 +863,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 @@ -880,7 +890,7 @@ // TEXT // -IDR_GPL TEXT DISCARDABLE "../../LICENSE" +IDR_GPL TEXT DISCARDABLE "../LICENSE" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -1008,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