[vlc-devel] [PATCH] codec: x264: don't check whether the configuration has the default value or not

[Zhao Zhili]

---
 modules/codec/x264.c | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 97bc823..f709ed9 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -989,16 +989,11 @@ static int  Open ( vlc_object_t *p_this )
     /* max bitrate = average bitrate -> CBR */
     p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
 
-
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
-       p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" );
-
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
-        p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
+    p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" );
+    p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
 
     /* disable deblocking when nf (no loop filter) is enabled */
-    if( var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ) )
-       p_sys->param.b_deblocking_filter = !var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" );
+    p_sys->param.b_deblocking_filter = !var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" );
 
     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "deblock" );
     if( psz_val )
@@ -1025,8 +1020,7 @@ static int  Open ( vlc_object_t *p_this )
         free( psz_val );
     }
 
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" ) )
-       p_sys->param.analyse.b_psy = var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" );
+    p_sys->param.analyse.b_psy = var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" );
 
     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "level" );
     if( psz_val )
@@ -1169,11 +1163,10 @@ static int  Open ( vlc_object_t *p_this )
 
     p_sys->param.analyse.b_psnr = var_GetBool( p_enc, SOUT_CFG_PREFIX "psnr" );
     p_sys->param.analyse.b_ssim = var_GetBool( p_enc, SOUT_CFG_PREFIX "ssim" );
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "weightb" ) )
-       p_sys->param.analyse.b_weighted_bipred = var_GetBool( p_enc,
+    p_sys->param.analyse.b_weighted_bipred = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "weightb" );
-    if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" ) != 2 )
-       p_sys->param.analyse.i_weighted_pred = var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" );
+    p_sys->param.analyse.i_weighted_pred = var_GetInteger( p_enc,
+                                    SOUT_CFG_PREFIX "weightp" );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "b-adapt" );
     p_sys->param.i_bframe_adaptive = i_val;
@@ -1185,22 +1178,19 @@ static int  Open ( vlc_object_t *p_this )
                                     SOUT_CFG_PREFIX "chroma-me" );
     p_sys->param.analyse.i_chroma_qp_offset = var_GetInteger( p_enc,
                                     SOUT_CFG_PREFIX "chroma-qp-offset" );
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mixed-refs" ) )
-       p_sys->param.analyse.b_mixed_references = var_GetBool( p_enc,
+    p_sys->param.analyse.b_mixed_references = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "mixed-refs" );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "trellis" );
     p_sys->param.analyse.i_trellis = i_val;
 
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "fast-pskip" ) )
-       p_sys->param.analyse.b_fast_pskip = var_GetBool( p_enc,
+    p_sys->param.analyse.b_fast_pskip = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "fast-pskip" );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "nr" );
     p_sys->param.analyse.i_noise_reduction = i_val;
 
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "dct-decimate" ) )
-       p_sys->param.analyse.b_dct_decimate = var_GetBool( p_enc,
+    p_sys->param.analyse.b_dct_decimate = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "dct-decimate" );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "deadzone-inter" );
@@ -1249,8 +1239,7 @@ static int  Open ( vlc_object_t *p_this )
     }
     free( psz_val );
 
-    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) )
-       p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc,
+    p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "8x8dct" );
 
     if( p_enc->fmt_in.video.i_sar_num > 0 &&
-- 
2.9.5