--- trunk/xvidcore/vfw/src/resource.rc 2005/03/27 03:59:42 1607 +++ trunk/xvidcore/vfw/src/resource.rc 2009/05/27 17:27:56 1864 @@ -77,8 +77,8 @@ IDD_MAIN DIALOGEX 0, 0, 225, 255 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD Configuration" -FONT 8, "MS Shell Dlg" +CAPTION "Xvid Configuration" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_PROFILE,88,16,91,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -98,9 +98,8 @@ PUSHBUTTON "Add",IDC_ADD,16,182,36,12 PUSHBUTTON "Remove",IDC_REMOVE,56,182,36,12 PUSHBUTTON "Zone Options...",IDC_EDIT,155,182,57,12 - PUSHBUTTON "Advanced Options...",IDC_ADVANCED,71,210,84,12 PUSHBUTTON "Load Defaults",IDC_DEFAULTS,7,238,64,13 - PUSHBUTTON "Decoder Options",IDC_DECODER,81,238,64,13 + PUSHBUTTON "Other Options...",IDC_OTHER,81,238,64,13 DEFPUSHBUTTON "OK",IDOK,156,238,64,13 GROUPBOX "Main Settings",IDC_STATIC,7,3,212,202 LTEXT "Encoding type:",IDC_STATIC,14,34,70,12,SS_CENTERIMAGE @@ -109,6 +108,10 @@ RTEXT "X",IDC_BITRATE_MAX,125,70,84,8 GROUPBOX "Zones",IDC_STATIC,7,98,212,107 GROUPBOX "More",IDC_STATIC,7,200,212,29 + COMBOBOX IDC_QUALITY,86,210,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "more...",IDC_QUALITY_ADV,182,210,28,12 + LTEXT "Quality preset:",IDC_STATIC,12,210,70,12,SS_CENTERIMAGE END IDD_QUANT DIALOG DISCARDABLE 0, 0, 212, 212 @@ -176,39 +179,21 @@ GROUPBOX "Curve compression",IDC_STATIC,7,156,197,51 END -IDD_DEBUG DIALOG DISCARDABLE 0, 0, 212, 212 +IDD_ENC DIALOG DISCARDABLE 0, 0, 212, 212 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug" +CAPTION "Encoder" FONT 8, "MS Shell Dlg" 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 - CONTROL "MMX",IDC_CPU_MMX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 28,44,33,10 - CONTROL "Integer SSE",IDC_CPU_MMXEXT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,28,57,54,10 - CONTROL "SSE",IDC_CPU_SSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 28,68,30,10 - 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,92,42,10 - CONTROL "3DNow! 2",IDC_CPU_3DNOWEXT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,28,105,48,10 - EDITTEXT IDC_NUMTHREADS,128,132,75,12,ES_AUTOHSCROLL | ES_NUMBER - COMBOBOX IDC_FOURCC,128,148,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | + EDITTEXT IDC_NUMTHREADS,127,32,75,12,ES_AUTOHSCROLL | ES_NUMBER + COMBOBOX IDC_FOURCC,127,13,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_DEBUG,128,164,76,12,ES_AUTOHSCROLL CONTROL "Print debug info on each frame",IDC_VOPDEBUG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,180,113,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,51,113,10 CONTROL "Display encoding status",IDC_DISPLAY_STATUS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,194,91,10 - GROUPBOX "Performance optimizations",IDC_STATIC,8,4,196,120 - LTEXT "Number of threads:",IDC_NUMTHREADS_STATIC,8,134,61,8 - LTEXT "FourCC used:",IDC_STATIC,8,150,80,8,SS_CENTERIMAGE - LTEXT "OutputDebugString debug level:",IDC_STATIC,8,166,104,12 + BS_AUTOCHECKBOX | WS_TABSTOP,7,64,91,10 + LTEXT "Number of threads (0=autodetect):", + IDC_NUMTHREADS_STATIC,7,34,109,8 + LTEXT "FourCC used:",IDC_STATIC,7,15,80,8,SS_CENTERIMAGE END IDD_QUANTMATRIX DIALOG DISCARDABLE 0, 0, 288, 149 @@ -481,16 +466,16 @@ IDD_ABOUT DIALOG DISCARDABLE 0, 0, 192, 165 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD MPEG4 Video Codec" +CAPTION "Xvid MPEG4 Video Codec" FONT 8, "MS Shell Dlg" BEGIN - CTEXT "GPL'ed MPEG4 video codec demonstration.\nFor educational purposes only.", + 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 MPEG4 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 @@ -526,27 +511,27 @@ COMBOBOX IDC_QUANTTYPE,111,32,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Edit Matrix...",IDC_QUANTMATRIX,111,47,76,12 - CONTROL "Adaptive Quantization",IDC_LUMMASK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,56,85,10 CONTROL "Interlaced Encoding",IDC_INTERLACING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,72,79,8 + BS_AUTOCHECKBOX | WS_TABSTOP,16,82,79,8, CONTROL "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,88,100,8 + WS_TABSTOP,16,98,100,8, CONTROL "Global Motion Compensation",IDC_GMC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,104,103,8 + BS_AUTOCHECKBOX | WS_TABSTOP,16,114,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 - EDITTEXT IDC_MAXBFRAMES,120,133,76,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_BQUANTRATIO,120,147,76,12,ES_AUTOHSCROLL - EDITTEXT IDC_BQUANTOFFSET,120,161,76,12,ES_AUTOHSCROLL + 16,128,40,8, + LTEXT "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,142,96,8 + EDITTEXT IDC_MAXBFRAMES,120,139,76,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_BQUANTRATIO,120,153,76,12,ES_AUTOHSCROLL + EDITTEXT IDC_BQUANTOFFSET,120,167,76,12,ES_AUTOHSCROLL CONTROL "Packed bitstream",IDC_PACKED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,182,71,10 - LTEXT "Quantizer ratio:",IDC_BQUANTRATIO_S,16,150,89,8 - LTEXT "Quantizer offset:",IDC_BQUANTOFFSET_S,16,164,52,8 + WS_TABSTOP,16,188,71,10 + LTEXT "Quantizer ratio:",IDC_BQUANTRATIO_S,16,156,89,8 + LTEXT "Quantizer offset:",IDC_BQUANTOFFSET_S,16,170,52,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 + WS_TABSTOP,100,82,56,10 + COMBOBOX IDC_LUMMASK,111,63,76,76, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + LTEXT "Adaptive Quantization:", IDC_LUMMASK_S,16,65,72,8, SS_LEFT END IDD_ZONE DIALOG DISCARDABLE 0, 0, 212, 194 @@ -601,7 +586,7 @@ 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", + GROUPBOX "Level - Xvid will not force you to respect these", 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 @@ -622,7 +607,7 @@ IDD_DEC DIALOG DISCARDABLE 0, 0, 212, 212 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Decoder Options" +CAPTION "Decoder" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Deblocking Y",IDC_DEC_DY,"Button",BS_AUTOCHECKBOX | @@ -643,7 +628,7 @@ IDD_STATUS DIALOGEX 0, 0, 325, 220 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD Status" +CAPTION "Xvid Status" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_STATUS_GRAPH,"Static",SS_OWNERDRAW | SS_NOTIFY,4, @@ -782,7 +767,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 @@ -834,8 +819,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", @@ -848,7 +833,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 @@ -867,6 +853,36 @@ ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END +IDD_COMMON DIALOG DISCARDABLE 0, 0, 212, 212 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Common" +FONT 8, "MS Shell Dlg" +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 + CONTROL "MMX",IDC_CPU_MMX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 28,44,33,10 + CONTROL "Integer SSE",IDC_CPU_MMXEXT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,28,56,54,10 + CONTROL "SSE",IDC_CPU_SSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 28,68,30,10 + 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 + 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 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -980,8 +996,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDC_CPU_AUTO "Enable XviD's internal CPU detection" - IDC_CPU_FORCE "Override XviD's internal CPU detection (not recommended)" + IDC_CPU_AUTO "Enable Xvid's internal CPU detection" + IDC_CPU_FORCE "Override Xvid's internal CPU detection (not recommended)" END STRINGTABLE DISCARDABLE @@ -1011,7 +1027,7 @@ BEGIN IDC_CARTOON "Enables special motion estimation features for cartoons/anime." IDC_OVERFLOW_CONTROL_STRENGTH - "0=Default from core (let xvid decide). Else overflow payback percent per frame. Higher value will meet target file size better, but will also spoil quantizer distribution more." + "0=Default from core (let Xvid decide). Else overflow payback percent per frame. Higher value will meet target file size better, but will also spoil quantizer distribution more." 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