VfW: some reorganization
authorLoren Merritt <pengvado@videolan.org>
Sun, 9 Oct 2005 21:37:56 +0000 (21:37 +0000)
committerLoren Merritt <pengvado@videolan.org>
Sun, 9 Oct 2005 21:37:56 +0000 (21:37 +0000)
patch by Francesco Corriga.

git-svn-id: svn://svn.videolan.org/x264/trunk@323 df754926-b1dd-0310-bc7b-ec298dee348c

vfw/config.c
vfw/resource.rc

index 8887dd9..d8dee75 100644 (file)
@@ -252,7 +252,7 @@ BOOL CALLBACK callback_main( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
                        tie.iImage = -1; 
                        tie.pszText = "Bitrate";                        TabCtrl_InsertItem(hTabCtrl, 0, &tie);
                        tie.pszText = "Rate Control";           TabCtrl_InsertItem(hTabCtrl, 1, &tie);
-                       tie.pszText = "I/P/B Frames";           TabCtrl_InsertItem(hTabCtrl, 2, &tie);
+                       tie.pszText = "MBs&&Frames";     TabCtrl_InsertItem(hTabCtrl, 2, &tie);
                        tie.pszText = "More...";                        TabCtrl_InsertItem(hTabCtrl, 3, &tie);
                        hTabs[0] = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_TAB_BITRATE),         hDlg, (DLGPROC)callback_tabs, lParam);
                        hTabs[1] = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_TAB_RATECONTROL),     hDlg, (DLGPROC)callback_tabs, lParam);
@@ -435,12 +435,18 @@ void tabs_update_items( HWND hDlg, CONFIG * config )
     SetDlgItemText( hTabs[0], IDC_STATSFILE, config->stats );
 
        /* update rate control tab */
+       if (SendMessage( GetDlgItem(hTabs[1],IDC_DIRECTPRED), CB_GETCOUNT, 0, 0 ) == 0)
+       {
+               SendDlgItemMessage(hTabs[1], IDC_DIRECTPRED, CB_ADDSTRING, 0, (LPARAM)"Spatial");
+               SendDlgItemMessage(hTabs[1], IDC_DIRECTPRED, CB_ADDSTRING, 0, (LPARAM)"Temporal");
+       }
     SetDlgItemInt( hTabs[1], IDC_QPMIN, config->i_qp_min, FALSE );
     SetDlgItemInt( hTabs[1], IDC_QPMAX, config->i_qp_max, FALSE );
     SetDlgItemInt( hTabs[1], IDC_QPSTEP, config->i_qp_step, FALSE );
     SetDlgItemInt( hTabs[1], IDC_IPRATIO, config->i_key_boost, FALSE );
     SetDlgItemInt( hTabs[1], IDC_PBRATIO, config->i_b_red, FALSE );
     SetDlgItemInt( hTabs[1], IDC_CURVECOMP, config->i_curve_comp, FALSE );
+    SendDlgItemMessage(hTabs[1], IDC_DIRECTPRED, CB_SETCURSEL, (config->i_direct_mv_pred), 0);
 
        /* update debug tab */
        if (SendMessage( GetDlgItem(hTabs[3],IDC_LOG), CB_GETCOUNT, 0, 0 ) == 0)
@@ -519,8 +525,6 @@ void tabs_update_items( HWND hDlg, CONFIG * config )
                SendDlgItemMessage(hTabs[3], IDC_ME_METHOD, CB_ADDSTRING, 0, (LPARAM)"Hexagonal Search");
                SendDlgItemMessage(hTabs[3], IDC_ME_METHOD, CB_ADDSTRING, 0, (LPARAM)"Uneven Multi-Hexagon");
                SendDlgItemMessage(hTabs[3], IDC_ME_METHOD, CB_ADDSTRING, 0, (LPARAM)"Exhaustive Search");
-               SendDlgItemMessage(hTabs[3], IDC_DIRECTPRED, CB_ADDSTRING, 0, (LPARAM)"Spatial");
-               SendDlgItemMessage(hTabs[3], IDC_DIRECTPRED, CB_ADDSTRING, 0, (LPARAM)"Temporal");
                SendDlgItemMessage(hTabs[3], IDC_SUBPEL, CB_ADDSTRING, 0, (LPARAM)"1 (Fastest)");
                SendDlgItemMessage(hTabs[3], IDC_SUBPEL, CB_ADDSTRING, 0, (LPARAM)"2");
                SendDlgItemMessage(hTabs[3], IDC_SUBPEL, CB_ADDSTRING, 0, (LPARAM)"3");
@@ -530,7 +534,6 @@ void tabs_update_items( HWND hDlg, CONFIG * config )
        }
 
     SendDlgItemMessage(hTabs[3], IDC_ME_METHOD, CB_SETCURSEL, (config->i_me_method), 0);
-    SendDlgItemMessage(hTabs[3], IDC_DIRECTPRED, CB_SETCURSEL, (config->i_direct_mv_pred), 0);
     SendDlgItemMessage(hTabs[3], IDC_SUBPEL, CB_SETCURSEL, (config->i_subpel_refine), 0);
     SetDlgItemInt( hTabs[3], IDC_MERANGE, config->i_me_range, FALSE );
     CheckDlgButton( hTabs[3],IDC_CHROMAME,
@@ -754,7 +757,7 @@ BOOL CALLBACK callback_tabs( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
                 }
                 EnableWindow( GetDlgItem( hTabs[2], IDC_BREFS ), config->i_bframe > 1 );
                 EnableWindow( GetDlgItem( hTabs[2], IDC_WBPRED ), config->i_bframe > 1 );
-                EnableWindow( GetDlgItem( hTabs[3], IDC_DIRECTPRED ), config->i_bframe > 0 );
+                EnableWindow( GetDlgItem( hTabs[1], IDC_DIRECTPRED ), config->i_bframe > 0 );
                 EnableWindow( GetDlgItem( hTabs[2], IDC_BADAPT ), config->i_bframe > 0 );
                 EnableWindow( GetDlgItem( hTabs[2], IDC_BBIAS ), config->i_bframe > 0 );
                 EnableWindow( GetDlgItem( hTabs[2], IDC_BBIASSLIDER ), config->i_bframe > 0 );
@@ -820,7 +823,7 @@ BOOL CALLBACK callback_tabs( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
             switch ( LOWORD( wParam ) ) 
                        {
             case IDC_DIRECTPRED:
-                config->i_direct_mv_pred = SendDlgItemMessage(hTabs[3], IDC_DIRECTPRED, CB_GETCURSEL, 0, 0);
+                config->i_direct_mv_pred = SendDlgItemMessage(hTabs[1], IDC_DIRECTPRED, CB_GETCURSEL, 0, 0);
                 break;
             case IDC_SUBPEL:
                 config->i_subpel_refine = SendDlgItemMessage(hTabs[3], IDC_SUBPEL, CB_GETCURSEL, 0, 0);
index d5ffb19..67b324f 100644 (file)
@@ -44,10 +44,10 @@ BEGIN
     CONTROL         108,IDC_LOGO,"Static",SS_BITMAP,31,12,136,39,WS_EX_CLIENTEDGE
     COMBOBOX        IDC_BITRATEMODE,30,66,138,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Average Bitrate (kbps)",IDC_BITRATELABEL,30,84,90,12
-    CONTROL         "",IDC_BITRATESLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,24,95,150,18
+    CONTROL         "",IDC_BITRATESLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,24,98,150,18
     EDITTEXT        IDC_BITRATEEDIT,144,84,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "0",IDC_BITRATELOW,30,114,66,12
-    RTEXT           "5000",IDC_BITRATEHIGH,108,114,60,12
+    LTEXT           "0",IDC_BITRATELOW,30,116,66,12
+    RTEXT           "5000",IDC_BITRATEHIGH,108,116,60,12
     CONTROL         "Update Statsfile",IDC_UPDATESTATS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,72,12
     LTEXT           "Statsfile name",IDC_STATIC,12,156,48,12,SS_CENTERIMAGE
     EDITTEXT        IDC_STATSFILE,60,156,102,12,ES_AUTOHSCROLL
@@ -58,20 +58,20 @@ IDD_TAB_IPFRAMES DIALOGEX 0, 0, 200, 188
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "I Frames",IDC_STATIC,6,2,186,40,WS_DISABLED
-    GROUPBOX        "P Frames",IDC_STATIC,6,44,186,51,WS_DISABLED
-    GROUPBOX        "B Frames",IDC_STATIC,6,98,186,82,WS_DISABLED
-    CONTROL         "8x8 DCT",IDC_DCT8X8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,12,42,12,WS_EX_TRANSPARENT
-    CONTROL         "8x8 Intra search",IDC_I8X8,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,24,66,12,WS_EX_TRANSPARENT
-    CONTROL         "4x4 Intra search",IDC_I4X4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,24,66,12,WS_EX_TRANSPARENT
-    CONTROL         "8x16, 16x8 and 8x8 P-frame search",IDC_P16X16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,54,127,12,WS_EX_TRANSPARENT
-    CONTROL         "4x8, 8x4 and 4x4 P-frame search",IDC_P8X8,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,66,119,12,WS_EX_TRANSPARENT
-    LTEXT           "Max ref frames",IDC_STATIC,30,78,52,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_REFFRAMES,84,78,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Adaptive",IDC_BADAPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,120,43,12,WS_EX_TRANSPARENT
-    CONTROL         "Use as references",IDC_BREFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,108,71,12,WS_EX_TRANSPARENT
-    CONTROL         "Weighted biprediction",IDC_WBPRED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,120,82,12,WS_EX_TRANSPARENT
-    CONTROL         "8x16, 16x8 and 8x8 B-frame search",IDC_B16X16,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,132,127,12,WS_EX_TRANSPARENT
+    GROUPBOX        "Other",IDC_STATIC,6,2,186,27,WS_DISABLED
+    GROUPBOX        "Partitions",IDC_STATIC,6,31,186,79,WS_DISABLED
+    GROUPBOX        "B Frames",IDC_STATIC,6,112,186,68,WS_DISABLED
+    CONTROL         "8x8 Transform",IDC_DCT8X8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,12,60,12,WS_EX_TRANSPARENT
+    CONTROL         "8x8 Intra search",IDC_I8X8,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,81,66,12,WS_EX_TRANSPARENT
+    CONTROL         "4x4 Intra search",IDC_I4X4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,94,66,12,WS_EX_TRANSPARENT
+    CONTROL         "8x16, 16x8 and 8x8 P-frame search",IDC_P16X16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,42,127,12,WS_EX_TRANSPARENT
+    CONTROL         "4x8, 8x4 and 4x4 P-frame search",IDC_P8X8,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,68,119,12,WS_EX_TRANSPARENT
+    LTEXT           "Max ref frames",IDC_STATIC,95,12,49,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    EDITTEXT        IDC_REFFRAMES,148,12,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Adaptive",IDC_BADAPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,135,43,12,WS_EX_TRANSPARENT
+    CONTROL         "Use as references",IDC_BREFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,123,71,12,WS_EX_TRANSPARENT
+    CONTROL         "Weighted biprediction",IDC_WBPRED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,135,82,12,WS_EX_TRANSPARENT
+    CONTROL         "8x16, 16x8 and 8x8 B-frame search",IDC_B16X16,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,30,55,127,12,WS_EX_TRANSPARENT
     LTEXT           "Max consecutive",IDC_STATIC,30,148,60,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
     EDITTEXT        IDC_BFRAME,126,148,24,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Bias",IDC_STATIC,30,162,14,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
@@ -83,63 +83,64 @@ IDD_TAB_RATECONTROL DIALOGEX 0, 0, 200, 188
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Bitrate",IDC_STATIC,6,2,186,58,WS_DISABLED
-    GROUPBOX        "Quality",IDC_STATIC,6,62,186,58,WS_DISABLED
-    GROUPBOX        "Scene Cuts",IDC_STATIC,6,122,186,58,WS_DISABLED
-    LTEXT           "Keyframe boost (%)",IDC_STATIC,42,12,68,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "B-frames reduction (%)",IDC_STATIC,42,27,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Bitrate variability (%)",IDC_STATIC,42,40,68,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Min QP",IDC_STATIC,42,72,24,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Max QP",IDC_STATIC,42,86,26,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Max QP Step",IDC_STATIC,42,100,43,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Scene Cut Threshold",IDC_STATIC,42,132,72,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Min IDR-frame interval",IDC_STATIC,42,146,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Max IDR-frame interval",IDC_STATIC,42,160,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_IPRATIO,126,12,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_PBRATIO,126,26,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_CURVECOMP,126,40,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_QPMIN,126,72,24,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_QPMAX,126,86,24,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_QPSTEP,126,100,24,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_SCENECUT,126,132,24,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_KEYINTMIN,126,146,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_KEYINTMAX,126,160,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "Bitrate",IDC_STATIC,6,2,186,53,WS_DISABLED
+    GROUPBOX        "Quantization Limits",IDC_STATIC,6,56,186,52,WS_DISABLED
+    GROUPBOX        "Scene Cuts",IDC_STATIC,6,110,186,70,WS_DISABLED
+    LTEXT           "Keyframe boost (%)",IDC_STATIC,42,10,68,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "B-frames reduction (%)",IDC_STATIC,42,25,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Bitrate variability (%)",IDC_STATIC,42,38,68,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Min QP",IDC_STATIC,42,64,24,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Max QP",IDC_STATIC,42,78,26,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Max QP Step",IDC_STATIC,42,92,43,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Scene Cut Threshold",IDC_STATIC,42,119,72,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Min IDR-frame interval",IDC_STATIC,42,133,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Max IDR-frame interval",IDC_STATIC,42,147,78,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    EDITTEXT        IDC_IPRATIO,126,10,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_PBRATIO,126,24,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_CURVECOMP,126,38,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_QPMIN,126,64,24,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_QPMAX,126,78,24,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_QPSTEP,126,92,24,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_SCENECUT,126,119,24,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_KEYINTMIN,126,133,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_KEYINTMAX,126,147,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Direct mode",IDC_STATIC,42,161,42,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    COMBOBOX        IDC_DIRECTPRED,126,161,54,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_TAB_MISC DIALOGEX 0, 0, 200, 188
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT           "Strength",IDC_STATIC,78,144,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Threshold",IDC_STATIC,78,157,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "0",IDC_LOOPA_TXT,162,144,12,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "0",IDC_LOOPB_TXT,162,157,12,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    GROUPBOX        "Motion Estimation",IDC_STATIC,6,2,186,74,WS_DISABLED
+    LTEXT           "Strength",IDC_STATIC,82,140,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Threshold",IDC_STATIC,82,153,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "0",IDC_LOOPA_TXT,166,140,12,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "0",IDC_LOOPB_TXT,166,153,12,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    GROUPBOX        "Motion Estimation",IDC_STATIC,7,2,186,64,WS_DISABLED
     LTEXT           "Partition decision",IDC_STATIC,30,12,60,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Method",IDC_STATIC,30,27,30,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Direct mode",IDC_STATIC,30,42,42,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Range",IDC_STATIC,30,57,24,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    GROUPBOX        "Debug",IDC_STATIC,96,80,96,46,WS_DISABLED
-    LTEXT           "Log Mode",IDC_STATIC,102,90,36,12,SS_CENTERIMAGE
-    LTEXT           "FourCC",IDC_STATIC,102,108,36,12,SS_CENTERIMAGE
-    LTEXT           "Sample AR",IDC_STATIC,6,90,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
-    LTEXT           "Threads",IDC_THREADS,6,108,30,12,SS_CENTERIMAGE
-    CTEXT           ":",IDC_STATIC,57,90,12,12,SS_CENTERIMAGE
-    CONTROL         "CABAC",IDC_CABAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,126,39,12,WS_EX_TRANSPARENT
-    CONTROL         "Deblocking filter:",IDC_LOOPFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,144,66,12
-    CONTROL         "",IDC_INLOOP_A,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,114,145,42,12,WS_EX_TRANSPARENT
-    CONTROL         "",IDC_INLOOP_B,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,114,157,42,12,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_SAR_W,42,90,18,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_SAR_H,66,90,18,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_THREADEDIT,42,108,18,12,ES_AUTOHSCROLL | ES_NUMBER
-    COMBOBOX        IDC_LOG,138,90,48,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_FOURCC,138,108,30,12,ES_AUTOHSCROLL
-    CTEXT           "BUILD",IDC_BUILDREV,12,174,174,8,SS_CENTERIMAGE | WS_DISABLED
-    CONTROL         "Chroma ME",IDC_CHROMAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,57,48,12,WS_EX_TRANSPARENT
+    LTEXT           "Method",IDC_STATIC,30,30,30,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Range",IDC_STATIC,30,48,24,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Log level",IDC_STATIC,100,85,36,12,SS_CENTERIMAGE
+    GROUPBOX        "Debug",IDC_STATIC,94,75,96,46,WS_DISABLED
+    LTEXT           "FourCC",IDC_STATIC,100,103,36,12,SS_CENTERIMAGE
+    LTEXT           "Sample AR",IDC_STATIC,10,85,36,12,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    LTEXT           "Threads",IDC_THREADS,10,103,30,12,SS_CENTERIMAGE
+    CTEXT           ":",IDC_STATIC,61,85,12,12,SS_CENTERIMAGE
+    CONTROL         "CABAC",IDC_CABAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,126,39,12,WS_EX_TRANSPARENT
+    CONTROL         "Deblocking filter:",IDC_LOOPFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,140,66,12
+    CONTROL         "",IDC_INLOOP_A,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,118,141,42,12,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_INLOOP_B,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,118,153,42,12,WS_EX_TRANSPARENT
+    EDITTEXT        IDC_SAR_W,46,85,18,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_SAR_H,70,85,18,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_THREADEDIT,46,103,18,12,ES_AUTOHSCROLL | ES_NUMBER
+    COMBOBOX        IDC_LOG,136,85,48,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_FOURCC,136,103,30,12,ES_AUTOHSCROLL
+    CTEXT           "BUILD",IDC_BUILDREV,12,169,174,8,SS_CENTERIMAGE | WS_DISABLED
+    CONTROL         "Chroma ME",IDC_CHROMAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,48,48,12,WS_EX_TRANSPARENT
     COMBOBOX        IDC_SUBPEL,90,12,84,77,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_ME_METHOD,84,27,90,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_MERANGE,60,57,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    COMBOBOX        IDC_DIRECTPRED,120,42,54,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_ME_METHOD,84,30,90,67,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_MERANGE,60,48,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "Misc. options",IDC_STATIC,7,68,186,113,WS_DISABLED
 END