Commit 094266b3 authored by Loren Merritt's avatar Loren Merritt

disable subme=0 (the huge bitrate penalty wasn't worth the speed)

renumber direct_pred


git-svn-id: svn://svn.videolan.org/x264/trunk@86 df754926-b1dd-0310-bc7b-ec298dee348c
parent 3a11b25d
......@@ -100,7 +100,7 @@ void x264_param_default( x264_param_t *param )
param->analyse.intra = X264_ANALYSE_I4x4;
param->analyse.inter = X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_BSUB16x16;
param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_TEMPORAL;
param->analyse.i_subpel_refine = 3;
param->analyse.i_subpel_refine = 5;
param->analyse.b_psnr = 1;
}
......
......@@ -343,7 +343,7 @@ x264_t *x264_encoder_open ( x264_param_t *param )
h->param.i_cabac_init_idc = x264_clip3( h->param.i_cabac_init_idc, -1, 2 );
param->analyse.i_subpel_refine = x264_clip3( param->analyse.i_subpel_refine, 0, 5 );
param->analyse.i_subpel_refine = x264_clip3( param->analyse.i_subpel_refine, 1, 5 );
if( h->param.rc.f_qblur < 0 )
h->param.rc.f_qblur = 0;
......
......@@ -52,8 +52,8 @@ typedef struct x264_t x264_t;
#define X264_ANALYSE_PSUB8x8 0x0020 /* Analyse p8x4, p4x8, p4x4 */
#define X264_ANALYSE_BSUB16x16 0x0100 /* Analyse b16x8, b8x16 and b8x8 */
#define X264_DIRECT_PRED_NONE 0
#define X264_DIRECT_PRED_TEMPORAL 1
#define X264_DIRECT_PRED_SPATIAL 2
#define X264_DIRECT_PRED_SPATIAL 1
#define X264_DIRECT_PRED_TEMPORAL 2
/* Colorspace type
*/
......
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