--- trunk/xvidcore/vfw/src/resource.rc 2010/12/02 06:46:07 1910 +++ branches/release-1_3-branch/xvidcore/vfw/src/resource.rc 2011/02/16 19:04:39 1952 @@ -19,8 +19,10 @@ // Neutral resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) +#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -37,28 +39,30 @@ CONTROL "Full quality first pass",IDC_FULL1PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,38,83,12 CONTROL "Discard first pass",IDC_DISCARD1PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,38,69,12 LTEXT "Stats filename:",IDC_STATIC,8,6,52,12,SS_CENTERIMAGE - CTEXT "If you don't discard first pass but keep full quality disabled,\nthe resulting 1st pass stream might not be mpeg-4 compliant.",IDC_STATIC,7,114,197,35 + CTEXT "If you don't discard first pass but keep full quality disabled,\nthe resulting 1st pass stream might not be MPEG-4 compliant.",IDC_STATIC,7,114,197,35 CTEXT "Full quality first pass is only useful if you want to keep the resulting stream.\nIt doesn't improve quality of second pass and normally should be disabled.",IDC_STATIC,7,71,197,35 END -IDD_MOTION DIALOG 0, 0, 212, 212 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_MOTION DIALOGEX 0, 0, 212, 212 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Motion" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_MOTION,112,19,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP 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,65,77,10 - CONTROL "Turbo ;-)",IDC_TURBO,"Button",BS_AUTOCHECKBOX | 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 "Use chroma motion",IDC_CHROMAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,91,77,10 + CONTROL "Turbo ;-)",IDC_TURBO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,91,43,10 + EDITTEXT IDC_FRAMEDROP,112,125,75,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_MAXKEY,112,145,76,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Motion search precision:",IDC_STATIC,14,20,80,12,SS_CENTERIMAGE LTEXT "VHQ mode:",IDC_STATIC,14,39,38,8 - LTEXT "Frame drop ratio:",IDC_FRAMEDROP_STATIC,14,96,68,12,SS_CENTERIMAGE - 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,67 - CONTROL "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,52,95,10 + LTEXT "Frame drop ratio:",IDC_FRAMEDROP_STATIC,14,125,68,12,SS_CENTERIMAGE + LTEXT "Maximum I-frame interval:",IDC_STATIC,14,146,80,12,SS_CENTERIMAGE + GROUPBOX "Motion Precision",IDC_STATIC,7,7,193,99 + GROUPBOX "Other",IDC_STATIC,7,108,193,67 + CONTROL "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,78,95,10 + COMBOBOX IDC_VHQ_METRIC,112,55,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "VHQ metric:",IDC_STATIC,14,56,38,8 END IDD_MAIN DIALOGEX 0, 0, 225, 255 @@ -143,16 +147,14 @@ GROUPBOX "Curve compression",IDC_STATIC,7,156,197,51 END -IDD_ENC DIALOG 0, 0, 212, 212 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ENC DIALOGEX 0, 0, 212, 212 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Encoder" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NUMTHREADS,127,32,75,12,ES_AUTOHSCROLL | ES_NUMBER COMBOBOX IDC_FOURCC,127,13,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Print debug info on each frame",IDC_VOPDEBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,113,10 - CONTROL "Display encoding status",IDC_DISPLAY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,91,10 - LTEXT "Number of threads (0=autodetect):",IDC_NUMTHREADS_STATIC,7,34,109,8 + CONTROL "Print debug info on each frame",IDC_VOPDEBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,113,10 + CONTROL "Display encoding status",IDC_DISPLAY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,91,10 LTEXT "FourCC used:",IDC_STATIC,7,15,80,8,SS_CENTERIMAGE END @@ -298,14 +300,14 @@ IDD_ABOUT DIALOG 0, 0, 192, 165 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Xvid MPEG4 Video Codec" +CAPTION "Xvid MPEG-4 Video Codec" FONT 8, "MS Shell Dlg" BEGIN CTEXT "Xvid is copyrighted software. It may be distributed\naccording to the terms of the GNU GPL license.",IDC_STATIC,12,112,168,20 CTEXT "WEBSITE",IDC_WEBSITE,60,92,72,8,SS_NOTIFY | SS_CENTERIMAGE CTEXT "BUILD",IDC_BUILD,8,28,176,8,SS_CENTERIMAGE CONTROL "IDB_LOGO",IDC_STATIC,"Static",SS_BITMAP,24,56,15,13 - CTEXT "Xvid MPEG4 video codec",IDC_STATIC,8,16,176,12 + CTEXT "Xvid MPEG-4 video codec",IDC_STATIC,8,16,176,12 GROUPBOX "About",IDC_STATIC,4,4,184,132 DEFPUSHBUTTON "OK",IDOK,102,144,80,14 CTEXT "CORE",IDC_CORE,8,40,176,8,SS_CENTERIMAGE @@ -331,15 +333,15 @@ CAPTION "Profile" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "",IDC_STATIC,8,144,198,69 + GROUPBOX "",IDC_STATIC,8,145,198,68 COMBOBOX IDC_PROFILE_PROFILE,72,21,128,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_QUANTTYPE,124,47,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Edit Matrix...",IDC_QUANTMATRIX,124,62,76,12 - CONTROL "Interlaced Encoding",IDC_INTERLACING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,97,79,8 - CONTROL "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,113,100,8 - CONTROL "Global Motion Compensation",IDC_GMC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,129,103,8 - CONTROL "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,145,40,8 - LTEXT "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,158,96,8 + PUSHBUTTON "Edit Matrix...",IDC_QUANTMATRIX,124,62,76,10 + CONTROL "Interlaced Encoding",IDC_INTERLACING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,94,79,8 + CONTROL "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,106,100,8 + CONTROL "Global Motion Compensation",IDC_GMC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,118,103,8 + CONTROL "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,146,40,8 + LTEXT "Max consecutive B-VOPs:",IDC_MAXBFRAMES_S,16,158,96,8 EDITTEXT IDC_MAXBFRAMES,124,155,76,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_BQUANTRATIO,124,169,76,12,ES_AUTOHSCROLL EDITTEXT IDC_BQUANTOFFSET,124,183,76,12,ES_AUTOHSCROLL @@ -347,13 +349,14 @@ LTEXT "Quantizer ratio:",IDC_BQUANTRATIO_S,16,172,89,8 LTEXT "Quantizer offset:",IDC_BQUANTOFFSET_S,16,186,52,8 LTEXT "Quantization type:",IDC_QUANTTYPE_S,16,50,85,8 - CONTROL "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,56,10 - COMBOBOX IDC_LUMMASK,124,78,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Adaptive Quantization:",IDC_LUMMASK_S,16,80,86,8 + CONTROL "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,94,56,10 + COMBOBOX IDC_LUMMASK,124,75,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Adaptive Quantization:",IDC_LUMMASK_S,16,77,86,8 GROUPBOX "",IDC_STATIC,4,7,202,37 LTEXT "Profile",IDC_STATIC,9,6,22,8 ICON IDI_MOBILE,IDC_PROFILE_LOGO,10,15,20,20,SS_REALSIZEIMAGE,WS_EX_ACCEPTFILES LTEXT "Profile @ Level:",IDC_PROFILE_LABEL,11,23,52,8,NOT WS_VISIBLE + CONTROL "Independent Slice Coding",IDC_SLICES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,130,103,8 END IDD_ZONE DIALOG 0, 0, 212, 194 @@ -371,7 +374,7 @@ CONTROL "Begin with keyframe",IDC_ZONE_FORCEIVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,92,8 CONTROL "Greyscale encoding",IDC_ZONE_GREYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,138,79,10 CONTROL "Chroma optimizer enabled",IDC_ZONE_CHROMAOPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,152,97,10 - LTEXT "BVOP sensitivity:",IDC_ZONE_BVOPTHRESHOLD_S,16,170,76,8 + LTEXT "B-VOP sensitivity:",IDC_ZONE_BVOPTHRESHOLD_S,16,170,76,8 EDITTEXT IDC_ZONE_BVOPTHRESHOLD,100,168,84,12,ES_AUTOHSCROLL LTEXT "Start frame #:",IDC_STATIC,8,6,52,10 GROUPBOX "Rate control",IDC_STATIC,7,22,198,90 @@ -507,7 +510,7 @@ GROUPBOX "",IDC_STATIC,7,7,196,127,BS_CENTER GROUPBOX "",IDC_STATIC,7,81,196,52,BS_CENTER CTEXT "X :",IDC_STATIC,25,60,10,10 - 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 "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 CTEXT "Y :",IDC_STATIC,86,60,10,10 CTEXT "Y :",IDC_STATIC,86,112,10,10 @@ -562,10 +565,10 @@ EDITTEXT IDC_LICENSE_TEXT,2,2,426,212,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END -IDD_COMMON DIALOG 0, 0, 212, 212 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_COMMON DIALOGEX 0, 0, 212, 212 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Common" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "Automatically detect optimizations",IDC_CPU_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,16,20,121,10 CONTROL "Force optimizations",IDC_CPU_FORCE,"Button",BS_AUTORADIOBUTTON,16,33,76,10 @@ -575,11 +578,13 @@ CONTROL "SSE2",IDC_CPU_SSE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,81,34,10 CONTROL "3DNow!",IDC_CPU_3DNOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,118,42,10 CONTROL "3DNow! 2",IDC_CPU_3DNOWEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,131,48,10 - EDITTEXT IDC_DEBUG,127,150,76,12,ES_AUTOHSCROLL - GROUPBOX "Performance optimizations",-1,8,4,196,141 - LTEXT "OutputDebugString debug level:",-1,7,152,104,12 + EDITTEXT IDC_DEBUG,127,166,76,12,ES_AUTOHSCROLL + GROUPBOX "Performance optimizations",-1,8,4,196,158 + LTEXT "OutputDebugString debug level:",-1,7,168,104,12 CONTROL "SSE3",IDC_CPU_SSE3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,93,34,10 CONTROL "SSE4",IDC_CPU_SSE4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,106,34,10 + EDITTEXT IDC_NUMTHREADS,127,145,69,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Number of threads:",IDC_NUMTHREADS_STATIC,28,147,68,8 END @@ -588,7 +593,7 @@ // Bitmap // -IDB_LOGO BITMAP "C:\\workspace\\xvidcore_head\\vfw\\src\\XviD_logo.bmp" +IDB_LOGO BITMAP "XviD_logo.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -643,6 +648,14 @@ #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_MOTION, DIALOG + BEGIN + END + + IDD_ENC, DIALOG + BEGIN + END + IDD_ABOUT, DIALOG BEGIN END @@ -667,6 +680,10 @@ IDD_LICENSE, DIALOG BEGIN END + + IDD_COMMON, DIALOG + BEGIN + END END #endif // APSTUDIO_INVOKED @@ -686,7 +703,7 @@ IDC_INTERLACING "Encodes frames as interlaced - only use if your source contains interlacing artifacts (i.e. fields instead of progressive frames)" IDC_OVERDEG "How much of the overflow the codec can eat into during oversized sections\nLarger values will prevent oversized files better, but will also spoil quantizer distribution more." IDC_MAXBFRAMES "Maximum number of sequential B-frames." - IDC_BQUANTRATIO "Ratio used to calculate the b-frame quantizer.\n\nBVOP quant = (AVG(past VOP quant, future VOP quant) * quant ratio + quant offset)" + IDC_BQUANTRATIO "Ratio used to calculate the B-frame quantizer.\n\nB-VOP quant = (AVG(past VOP quant, future VOP quant) * quant ratio + quant offset)" IDC_OVERIMP "How much of the overflow the codec can eat into during undersized sections.\nLarger values will prevent undersized files better, but will also spoil quantizer distribution more." IDC_CBR_REACTIONDELAY "Determines how slowly it will adjust the current encoding quality based upon scene intensity - this has the strongest influence on quality" IDC_CBR_AVERAGINGPERIOD "Determines how slowly it adapts to the current adjusted quality" @@ -697,7 +714,7 @@ STRINGTABLE BEGIN IDC_FRAMEDROP "Frame dropping ratio. 0 = no frame dropping .. 100 = drop all frames." - IDC_KFREDUCTION "Reduction of bitrate for the first consecutive i-frames. The last i-frame will get treated normally." + IDC_KFREDUCTION "Reduction of bitrate for the first consecutive i-frames. The last I-frame will get treated normally." IDC_GMC "Use Global Motion Compensation." END @@ -745,7 +762,7 @@ BEGIN IDC_QPEL "Use Quarter PixEL resolution for encoding for a more precise motion compensation" 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_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)." END @@ -769,7 +786,7 @@ STRINGTABLE 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_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" + 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 STRINGTABLE @@ -786,7 +803,7 @@ STRINGTABLE BEGIN - IDC_TURBO "Faster motion estimation for b-frames and quarterpel" + IDC_TURBO "Faster motion estimation for B-frames and quarterpel" IDC_BITRATE_TSIZE "Target file or media size" END @@ -814,17 +831,6 @@ IDC_ZONE_FORCEIVOP "Force a keyframe at the beginnig of the zone" END -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Deutsch (Deutschland) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) - ///////////////////////////////////////////////////////////////////////////// // // Icon @@ -836,7 +842,7 @@ IDI_HOME ICON "home_40.ico" IDI_HD1080 ICON "hd1080_40.ico" IDI_HD720 ICON "hd720_40.ico" -#endif // Deutsch (Deutschland) resources +#endif // Neutral resources /////////////////////////////////////////////////////////////////////////////