Commit 177e2113 authored by Loren Merritt's avatar Loren Merritt

vfw: tweak wording and defaults


git-svn-id: svn://svn.videolan.org/x264/trunk@96 df754926-b1dd-0310-bc7b-ec298dee348c
parent b80ed703
......@@ -146,7 +146,8 @@ LRESULT compress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiO
param.i_log_level = X264_LOG_NONE;
param.analyse.b_psnr = 0;
param.analyse.inter = param.analyse.intra = 0;
param.analyse.inter = 0;
param.analyse.intra = X264_ANALYSE_I4x4;
/* Set params: TODO to complete */
param.i_width = lpbiInput->bmiHeader.biWidth;
......@@ -180,10 +181,8 @@ LRESULT compress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiO
param.analyse.inter |= X264_ANALYSE_PSUB16x16;
if( config->b_psub8x8 )
param.analyse.inter |= X264_ANALYSE_PSUB8x8;
if( config->b_i4x4 ) {
param.analyse.intra |= X264_ANALYSE_I4x4;
if( config->b_i4x4 )
param.analyse.inter |= X264_ANALYSE_I4x4;
}
switch( config->i_encoding_type )
{
......@@ -196,7 +195,7 @@ LRESULT compress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiO
break;
default:
case 2: /* 2 PASS */
param.rc.psz_stat_out = param.rc.psz_stat_in = ".\\x264.stats";
param.rc.psz_stat_out = param.rc.psz_stat_in = statsfile;
if (config->i_pass == 1)
param.rc.b_stat_write = 1;
else {
......
......@@ -46,7 +46,7 @@
/* description */
#define X264_NAME "x264"
#define X264_DEF_TEXT "Are you sure you want to load default vaules"
#define X264_DEF_TEXT "Are you sure you want to load default values"
/* Registery handling */
typedef struct
......@@ -76,8 +76,8 @@ static const reg_int_t reg_int_table[] =
/* Advance dialog */
{ "cabac", &reg.b_cabac, 1 },
{ "loop_filter", &reg.b_filter, 1 },
{ "idrframe", &reg.i_keyint_min, 10 },
{ "iframe", &reg.i_keyint_max, 250},
{ "keyint_max", &reg.i_keyint_min, 25 },
{ "keyint_min", &reg.i_keyint_max, 250},
{ "refmax", &reg.i_refmax, 1 },
{ "bmax", &reg.i_bframe, 0 },
{"direct_pred", &reg.i_direct_mv_pred, 2 },
......@@ -87,9 +87,9 @@ static const reg_int_t reg_int_table[] =
/* analysis */
{"i4x4", &reg.b_i4x4, 1 },
{"psub16x16", &reg.b_psub16x16, 1 },
{"psub8x8", &reg.b_psub8x8, 0 },
{"psub8x8", &reg.b_psub8x8, 1 },
{"bsub16x16", &reg.b_bsub16x16, 1 },
{"subpel", &reg.i_subpel_refine, 3 }
{"subpel", &reg.i_subpel_refine, 4 }
};
......
......@@ -109,7 +109,7 @@ BEGIN
LTEXT "Intra closer than",IDC_STATIC,13,128,53,8
GROUPBOX "H.264 features",IDC_STATIC,7,7,288,228
EDITTEXT IDC_KEYFRAME,255,20,33,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Max Reference Frames:",IDC_STATIC,170,24,76,8
LTEXT "Max Reference Frames:",IDC_STATIC,170,24,80,8
EDITTEXT IDC_IFRAMES,114,107,24,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Max IDR-Keyframe Interval:",IDC_STATIC,13,110,95,8
EDITTEXT IDC_FOURCC,223,107,25,14,ES_AUTOHSCROLL
......@@ -117,19 +117,19 @@ BEGIN
CONTROL "8x16, 16x8 and 8x8 B-frame search",IDC_B16X16,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,189,127,10
EDITTEXT IDC_BFRAME,256,40,33,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Max B-Frames:",IDC_STATIC,197,43,48,8
CONTROL "4x4 INTRA search",IDC_I4X4,"Button",BS_AUTOCHECKBOX |
LTEXT "Max B-Frames:",IDC_STATIC,198,43,51,8
CONTROL "4x4 Intra search",IDC_I4X4,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,165,189,82,10
CONTROL "8x16, 16x8 and 8x8 P-frame search",IDC_P16X16,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,171,127,10
CONTROL "4x8, 8x4 and 4x4 P frame search",IDC_P8X8,"Button",
CONTROL "4x8, 8x4 and 4x4 P-frame search",IDC_P8X8,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,165,172,119,10
COMBOBOX IDC_SUBPEL,117,208,70,77,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
LTEXT "Subpixel refinement precision",IDC_STATIC,17,211,92,8
COMBOBOX IDC_DIRECTPRED,220,63,70,67,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
LTEXT "BFRAME prediction mode:",IDC_STATIC,133,65,84,8
LTEXT "B-frame prediction mode:",IDC_STATIC,133,65,84,8
CONTROL "Slider1",IDC_INLOOP_A,"msctls_trackbar32",TBS_NOTICKS |
WS_TABSTOP,56,53,47,10
GROUPBOX "",IDC_STATIC,7,40,115,44
......@@ -143,7 +143,7 @@ BEGIN
GROUPBOX "VfW settings",IDC_STATIC,151,93,144,66
LTEXT "0",IDC_LOOPA_TXT,109,53,8,8
LTEXT "0",IDC_LOOPB_TXT,109,66,8,8
GROUPBOX "Motion Search Precision",IDC_STATIC,7,154,288,81
GROUPBOX "Macroblock Partitions",IDC_STATIC,7,154,288,81
CONTROL "Deblocking Filter",IDC_LOOPFILTER,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,16,39,69,10
END
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment