--- branches/dev-api-4/xvidcore/vfw/src/resource.rc 2003/10/28 23:42:09 1193 +++ branches/dev-api-4/xvidcore/vfw/src/resource.rc 2003/12/19 13:48:47 1284 @@ -63,11 +63,8 @@ SS_CENTERIMAGE EDITTEXT IDC_FRAMEDROP,112,82,75,11,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_MAXKEY,112,100,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_MINKEY,112,120,76,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Maximum I-frame interval:",IDC_STATIC,12,102,80,12, SS_CENTERIMAGE - LTEXT "Minimum I-frame interval:",IDC_STATIC,12,120,94,12, - SS_CENTERIMAGE CONTROL "Use cartoon mode",IDC_CARTOON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,143,74,10 END @@ -100,8 +97,8 @@ EDITTEXT IDC_BITRATE,88,52,100,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "X",IDC_BITRATE_MIN,16,70,40,8 RTEXT "X",IDC_BITRATE_MAX,164,70,44,8 - LTEXT "Target bitrate (kbps):",IDC_BITRATE_S,14,52,66,12, - SS_NOTIFY | SS_CENTERIMAGE + LTEXT "Target bitrate (kbps):",IDC_BITRATE_S,14,52,72,12, + SS_NOTIFY | SS_CENTERIMAGE,WS_EX_DLGMODALFRAME PUSHBUTTON "...",IDC_BITRATE_CALC,196,52,16,12 END @@ -138,37 +135,34 @@ CAPTION "2nd Pass" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_KFBOOST,120,34,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_KFTRESHOLD,120,50,75,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_KFREDUCTION,120,66,75,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_CURVECOMPH,120,130,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_CURVECOMPL,120,146,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_PAYBACK,120,162,76,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Payback with bias",IDC_PAYBACKBIAS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,20,178,96,12 - CONTROL "Payback proportionally",IDC_PAYBACKPROP,"Button", - BS_AUTORADIOBUTTON,20,190,96,12 + EDITTEXT IDC_KFBOOST,118,34,78,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_KFREDUCTION,117,72,76,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_CURVECOMPH,118,150,75,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_CURVECOMPL,118,166,75,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_OVERFLOW_CONTROL_STRENGTH,118,182,75,12, + ES_AUTOHSCROLL | ES_NUMBER LTEXT "Stats filename:",IDC_STATIC,8,6,52,12,SS_CENTERIMAGE EDITTEXT IDC_STATS,72,6,112,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_STATS_BROWSE,188,6,16,11 - GROUPBOX "Two-pass tuning",IDC_STATIC,8,22,196,94 - LTEXT "Bitrate payback delay (frames):",IDC_STATIC,16,162,100, - 12,SS_CENTERIMAGE - LTEXT "High bitrate scenes %:",IDC_STATIC,16,130,100,12, - SS_CENTERIMAGE - LTEXT "Low bitrate scenes %:",IDC_STATIC,16,146,100,12, - SS_CENTERIMAGE - GROUPBOX "Curve compression",IDC_STATIC,8,120,196,88 - LTEXT "I-frame boost %:",IDC_STATIC,16,34,100,12, - SS_CENTERIMAGE - LTEXT "Below i-frame distance...:",IDC_STATIC,16,50,100,12 - LTEXT "I-frame bitrate reduction %:",IDC_STATIC,16,66,100,12 - EDITTEXT IDC_OVERIMP,120,82,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_OVERDEG,120,98,76,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Max overflow improvement %:",IDC_STATIC,16,82,100,12, + GROUPBOX "Two-pass tuning",IDC_STATIC,8,22,196,104 + LTEXT "Overflow control strength %:",IDC_STATIC,13,182,100,12, + SS_CENTERIMAGE + LTEXT "High bitrate scenes %:",IDC_STATIC,13,150,100,12, + SS_CENTERIMAGE + LTEXT "Low bitrate scenes %:",IDC_STATIC,13,166,100,12, SS_CENTERIMAGE - LTEXT "Max overflow degradation %:",IDC_STATIC,16,98,100,12, + GROUPBOX "Curve compression",IDC_STATIC,8,133,196,75 + LTEXT "I-frame boost %:",IDC_STATIC,13,34,91,12,SS_CENTERIMAGE + LTEXT "...are reduced by %:",IDC_STATIC,13,73,100,12 + EDITTEXT IDC_OVERIMP,118,94,75,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_OVERDEG,118,110,75,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Max overflow improvement %:",IDC_STATIC,13,94,100,12, SS_CENTERIMAGE + LTEXT "Max overflow degradation %:",IDC_STATIC,13,110,100,12, + SS_CENTERIMAGE + EDITTEXT IDC_MINKEY,118,56,75,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "I-frames closer than... frames:",IDC_STATIC,13,57,105, + 12 END IDD_DEBUG DIALOG DISCARDABLE 0, 0, 212, 212 @@ -518,17 +512,17 @@ WS_TABSTOP,16,66,100,8 CONTROL "Quarterpel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,79,100,8 - CONTROL "Global motion compenation",IDC_GMC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,94,100,8 + CONTROL "Global motion compensation",IDC_GMC,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,16,94,103,8 CONTROL "Reduced resolution",IDC_REDUCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,108,100,8 COMBOBOX IDC_PROFILE_PROFILE,84,8,116,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_MAXBFRAMES,120,134,76,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "Packed bitstream",IDC_PACKED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,182,71,10 + WS_TABSTOP,16,184,71,10 CONTROL "Closed GOV",IDC_CLOSEDGOV,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,194,55,10 + WS_TABSTOP,96,184,55,10 LTEXT "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,137,96,8 GROUPBOX "",IDC_STATIC,8,122,196,86 CONTROL "BVOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, @@ -561,8 +555,7 @@ WS_TABSTOP,16,140,47,10 CONTROL "Chroma optimizer",IDC_ZONE_CHROMAOPT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,156,69,10 - EDITTEXT IDC_ZONE_BVOPTHRESHOLD,100,170,84,12,ES_AUTOHSCROLL | - ES_NUMBER + EDITTEXT IDC_ZONE_BVOPTHRESHOLD,100,170,84,12,ES_AUTOHSCROLL CONTROL "Weight:",IDC_ZONE_MODE_WEIGHT,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,38,41,10 CONTROL "Quantizer:",IDC_ZONE_MODE_QUANT,"Button", @@ -576,7 +569,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,16,124,92,8 END -IDD_LEVEL DIALOG DISCARDABLE 0, 0, 212, 212 +IDD_LEVEL DIALOG DISCARDABLE 0, 0, 212, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Level" FONT 8, "MS Sans Serif" @@ -727,6 +720,42 @@ LTEXT "Avg bitrate (kbps):",IDC_STATIC,204,216,72,8 END +IDD_AR DIALOGEX 0, 0, 211, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Aspect Ratio" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Picture Aspect Ratio",IDC_AR,"Button", + BS_AUTORADIOBUTTON,13,81,81,10,WS_EX_TRANSPARENT + GROUPBOX "",IDC_STATIC,7,7,197,127,BS_CENTER + GROUPBOX "",IDC_STATIC,7,81,197,53,BS_CENTER + CONTROL "Pixel Aspect Ratio",IDC_PAR,"Button",BS_AUTORADIOBUTTON, + 13,7,73,10,WS_EX_TRANSPARENT + COMBOBOX IDC_ASPECT_RATIO,25,33,111,55,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_PARX,39,58,36,12,ES_NUMBER + EDITTEXT IDC_PARY,100,58,36,12,ES_NUMBER + CTEXT "X :",IDC_STATIC,25,60,10,10 + EDITTEXT IDC_ARX,39,110,36,12,ES_NUMBER + EDITTEXT IDC_ARY,100,110,36,12,ES_NUMBER + LTEXT "Aspect Ratio is written to mpeg-4 bitstream, but unfortunately is likely to be ignored if video stream is encapsulated in a general-purpose container (like .avi, .ogm., .mkv).", + IDC_STATIC,7,138,197,27 + LTEXT "Therefore, be aware that using different aspect ratio than default might be ignored by some players, especially when decoded on Windows.\n\nUse at your own risk.", + IDC_STATIC,7,168,197,41 + LTEXT "Select the shape of a pixel...",IDC_STATIC,25,18,104,10 + CTEXT "Y :",IDC_STATIC,86,60,10,10 + CTEXT "Y :",IDC_STATIC,86,112,10,10 + CTEXT "X :",IDC_STATIC,25,112,10,10 + LTEXT "Select the shape of the image...",IDC_STATIC,25,93,110, + 11 + GROUPBOX "Quick Setting",IDC_STATIC,148,7,56,127,0, + WS_EX_TRANSPARENT + PUSHBUTTON "Default",IDC_AR_DEFAULT,158,21,37,11 + PUSHBUTTON "4:3",IDC_AR_4_3,158,88,37,11 + PUSHBUTTON "16:9",IDC_AR_16_9,158,102,37,11 + PUSHBUTTON "2,35:1",IDC_AR_235_100,158,116,37,11 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -768,6 +797,8 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 193 + VERTGUIDE, 13 + VERTGUIDE, 118 TOPMARGIN, 7 END @@ -805,7 +836,7 @@ IDD_PROFILE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 181 + RIGHTMARGIN, 204 TOPMARGIN, 7 BOTTOMMARGIN, 211 END @@ -823,7 +854,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 181 TOPMARGIN, 7 - BOTTOMMARGIN, 211 + BOTTOMMARGIN, 214 END IDD_CALC, DIALOG @@ -840,6 +871,17 @@ TOPMARGIN, 7 BOTTOMMARGIN, 224 END + + IDD_AR, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 204 + VERTGUIDE, 28 + TOPMARGIN, 7 + BOTTOMMARGIN, 209 + HORZGUIDE, 81 + HORZGUIDE, 134 + END END #endif // APSTUDIO_INVOKED @@ -908,9 +950,6 @@ IDC_DUMMY2PASS "Performs a dummy 2nd pass - doesn't output any video data" IDC_CURVECOMPH "The higher this value, the more bits get taken from frames larger than the average size, and redistributed to others" IDC_CURVECOMPL "The higher this value, the more bits get assigned to frames below the average frame size" - IDC_PAYBACK "The higher this value, the longer the codec has to smooth out bit allocation" - IDC_PAYBACKBIAS "Payback with bias to small frames" - IDC_PAYBACKPROP "Payback proportionally (all frames treated equally)" IDC_STATS1 "Location for 1st pass stats file to be saved to" IDC_STATS2 "Location for 2nd pass curve stats to be loaded from - External mode only" IDC_CREDITS_START_BEGIN "Credits begin at this frame" @@ -971,6 +1010,13 @@ IDC_LEVEL_BITRATE "Maximum instantaneous bitrate." END +STRINGTABLE DISCARDABLE +BEGIN + IDC_OVERFLOW_CONTROL_STRENGTH + "0=Default from core (let xvid decide). Else overflow payback percent per frame." + IDC_ASPECT_RATIO "Display aspect ratio is used to scale the video on playback/anamorphic encoding).\n\nDefault 1:1 for no scaling necessary." +END + #endif // Neutral resources /////////////////////////////////////////////////////////////////////////////