--- trunk/xvidcore/vfw/src/resource.rc 2004/03/22 22:36:25 1382 +++ trunk/xvidcore/vfw/src/resource.rc 2005/01/16 10:23:53 1595 @@ -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 @@ -61,13 +57,11 @@ COMBOBOX IDC_VHQ,112,37,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use chroma motion",IDC_CHROMAME,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,14,58,77,10 + BS_AUTOCHECKBOX | WS_TABSTOP,14,65,77,10 CONTROL "Turbo ;-)",IDC_TURBO,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,143,58,43,10 + 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,9 @@ 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 IDD_MAIN DIALOGEX 0, 0, 225, 255 @@ -176,7 +172,7 @@ SS_CENTERIMAGE LTEXT "I-frames closer than... (frames):",IDC_STATIC,16,56,124, 11 - GROUPBOX "Overlflow treatment",IDC_STATIC,7,86,197,75 + GROUPBOX "Overflow treatment",IDC_STATIC,7,86,197,75 GROUPBOX "Curve compression",IDC_STATIC,7,156,197,51 END @@ -496,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,19 +523,17 @@ LTEXT "Profile @ Level:",IDC_STATIC,8,10,52,8 COMBOBOX IDC_PROFILE_PROFILE,84,8,116,76,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 @@ -547,11 +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,100,72,56,10 END IDD_ZONE DIALOG DISCARDABLE 0, 0, 212, 194 @@ -582,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,26 +588,27 @@ BEGIN COMBOBOX IDC_LEVEL_PROFILE,84,8,116,76,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,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_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 | 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_STATIC,8,28,196,66 + LTEXT "Suggested:",IDC_STATIC,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 "x",IDC_STATIC,160,45,8,8 + GROUPBOX "Video Buffer Verifier - used in Two-Pass mode", + IDC_STATIC,8,100,196,49 END IDD_DEC DIALOG DISCARDABLE 0, 0, 212, 212 @@ -619,13 +617,19 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Deblocking Y",IDC_DEC_DY,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,21,25,63,13 + WS_TABSTOP,15,64,63,13 CONTROL "Deblocking UV",IDC_DEC_DUV,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,21,42,79,13 - CONTROL "Deringing",IDC_DEC_DR,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,115,25,60,13 + WS_TABSTOP,15,80,61,13 + CONTROL "Deringing Y",IDC_DEC_DRY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,88,64,60,13 CONTROL "Film Effect",IDC_DEC_FE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,115,42,60,13 + WS_TABSTOP,154,64,45,13 + GROUPBOX "Brightness",IDC_STATIC,5,6,202,41 + CONTROL "Slider1",IDC_DEC_BRIGHTNESS,"msctls_trackbar32", + TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,18,18,181,24 + GROUPBOX "Postprocessing",IDC_STATIC,5,52,202,46 + CONTROL "Deringing UV",IDC_DEC_DRUV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,88,80,60,13 END IDD_STATUS DIALOGEX 0, 0, 325, 220 @@ -844,6 +848,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 "Dismiss",IDOK,172,218,84,14 + EDITTEXT IDC_LICENSE_TEXT,2,2,426,212,ES_MULTILINE | + ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL +END + ///////////////////////////////////////////////////////////////////////////// // @@ -854,6 +868,51 @@ ///////////////////////////////////////////////////////////////////////////// // +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON DISCARDABLE "xvid.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// 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 // @@ -928,7 +987,15 @@ IDC_CHROMAME "Use chroma information to detect motion (slower)." IDC_BQUANTOFFSET "B-frame quantizer offset from last p-frame quantizer; refer to b-frame quant ratio (above)" IDC_VHQ "VHQ enables an additional search process to increase quality (much slower)." - IDC_CHROMA_OPT "Interpolates colours in bright/dark areas for achieving a nicer edge impression" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_ZONE_CHROMAOPT "Interpolates colours in bright/dark areas for achieving a nicer edge impression" + IDC_ZONE_BVOPTHRESHOLD "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" + IDC_LEVEL_PROFILE "Restrict the usage of MPEG-4 tools and limit the encoded bitrate such that bitstreams are compatible with hardware decoders." + IDC_LEVEL_WIDTH "Suggested VOP width (pixels)" + IDC_LEVEL_HEIGHT "Suggested VOP height (pixels)" END STRINGTABLE DISCARDABLE @@ -947,21 +1014,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDC_LEVEL_PROFILE "Restrict the usage of MPEG-4 tools and limit the encoded bitrate such that bitstreams are compatible with hardware decoders." - IDC_LEVEL_WIDTH "Suggested VOP width (pixels)" - IDC_LEVEL_HEIGHT "Suggested VOP height (pixels)" -END - -STRINGTABLE DISCARDABLE -BEGIN IDC_LEVEL_FPS "Suggested VOP rate (frames-per-second)" IDC_LEVEL_VMV "Video Memory Verifier (VMV):\n\nThe maximum number of macroblocks permitted per VOP." IDC_LEVEL_VCV "Video Complexity Verifier (VCV):\nThe maximum macroblocks decoded per second." IDC_LEVEL_VBV "Video Buffer Verifier (VBV):\n\nThe maximum size of the video decoder buffer. The encoded bitstream but not overflow or underflow this buffer." IDC_LEVEL_BITRATE "Maximum instantaneous bitrate." IDC_BITRATE "The target AVI bitrate, file size, or quantizer." - IDC_ZONE_BVOPTHRESHOLD_S - "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" IDC_TRELLISQUANT "Advanced, high quality quantization mode" IDC_BITRATE_S "Toggle between quantizer, target bitrate, target file size" END @@ -1000,44 +1058,6 @@ ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// English (Australia) 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 // English (Australia) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED /////////////////////////////////////////////////////////////////////////////