Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / codec / x264.c

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 96b5f2c2121d65cbb89864c93fe8da69756d3373..c88635a423fe94ef43d12119569f756658fdcdd5 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -67,6 +67,11 @@ static void Close( vlc_object_t * );
     "If scenecuts appear within this interval, they are still encoded as " \
     "I-frames, but do not start a new GOP." )
 
+#define OPENGOP_TEXT N_("Use recovery points to close GOPs")
+#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
+    "normal: use standard open GOPs\n" \
+    "bluray: use Blu-ray compatible open GOPs" )
+
 #define SCENE_TEXT N_("Extra I-frames aggressivity" )
 #define SCENE_LONGTEXT N_( "Scene-cut detection. Controls how " \
     "aggressively to insert extra I-frames. With small values of " \
@@ -419,6 +424,12 @@ vlc_module_begin ()
     add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT,
                  MIN_KEYINT_LONGTEXT, false )
 
+#if X264_BUILD >= 102
+    add_string( SOUT_CFG_PREFIX "opengop", "none", NULL, OPENGOP_TEXT,
+               OPENGOP_LONGTEXT,false )
+        change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
+#endif
+
     add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT,
                  SCENE_LONGTEXT, false )
         change_integer_range( -1, 100 )
@@ -437,8 +448,13 @@ vlc_module_begin ()
                  B_BIAS_LONGTEXT, false )
         change_integer_range( -100, 100 )
 
+#if X264_BUILD >= 87
+    add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT,
+              BPYRAMID_LONGTEXT, false )
+#else
     add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT,
               BPYRAMID_LONGTEXT, false )
+#endif
         change_string_list( bpyramid_list, bpyramid_list, 0 );
 
     add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT,
@@ -595,7 +611,7 @@ vlc_module_begin ()
 
     add_obsolete_bool( SOUT_CFG_PREFIX "bime" )
 
-    add_bool( SOUT_CFG_PREFIX "8x8dct", false, NULL, TRANSFORM_8X8DCT_TEXT,
+    add_bool( SOUT_CFG_PREFIX "8x8dct", true, NULL, TRANSFORM_8X8DCT_TEXT,
               TRANSFORM_8X8DCT_LONGTEXT, false )
 
     add_integer( SOUT_CFG_PREFIX "trellis", 1, NULL, TRELLIS_TEXT,
@@ -660,12 +676,10 @@ vlc_module_begin ()
     add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
                 STATS_LONGTEXT, false )
 
-#if X264_BUILD >= 93
     add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
         change_string_list( x264_preset_names, x264_preset_names, 0 );
     add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false )
         change_string_list( x264_tune_names, x264_tune_names, 0 );
-#endif
 
 vlc_module_end ()
 
@@ -686,7 +700,7 @@ static const char *const ppsz_sout_options[] = {
     "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", "weightp",
     "aq-mode", "aq-strength", "psy-rd", "psy", "profile", "lookahead", "slices",
     "slice-max-size", "slice-max-mbs", "intra-refresh", "mbtree", "hrd",
-    "tune","preset", NULL
+    "tune","preset", "opengop", NULL
 };
 
 static block_t *Encode( encoder_t *, picture_t * );
@@ -696,9 +710,9 @@ struct encoder_sys_t
     x264_t          *h;
     x264_param_t    param;
 
-    int  i_initial_delay;
+    mtime_t         i_initial_delay;
 
-    char *psz_stat_name;
+    char            *psz_stat_name;
 };
 
 #ifdef PTW32_STATIC_LIB
@@ -742,7 +756,6 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->psz_stat_name = NULL;
 
     x264_param_default( &p_sys->param );
-#if X264_BUILD >= 93
     char *psz_preset = var_GetString( p_enc, SOUT_CFG_PREFIX  "preset" );
     char *psz_tune = var_GetString( p_enc, SOUT_CFG_PREFIX  "tune" );
     if( *psz_preset == '\0' )
@@ -753,7 +766,6 @@ static int  Open ( vlc_object_t *p_this )
     x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
     free( psz_preset );
     free( psz_tune );
-#endif
     p_sys->param.i_width  = p_enc->fmt_in.video.i_width;
     p_sys->param.i_height = p_enc->fmt_in.video.i_height;
 
@@ -899,6 +911,16 @@ static int  Open ( vlc_object_t *p_this )
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
     if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;
 
+#if X264_BUILD >= 102
+    psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" );
+    if( !strcmp( psz_val, "none" ) )
+        p_sys->param.i_open_gop = X264_OPEN_GOP_NONE;
+    else if( !strcmp( psz_val, "normal" ) )
+        p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL;
+    else if( !strcmp( psz_val, "bluray" ) )
+        p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY;
+    free( psz_val );
+#endif
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" );
     if( i_val >= 0 && i_val <= 16 && i_val != 3 )
         p_sys->param.i_bframe = i_val;
@@ -906,16 +928,19 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->param.b_intra_refresh = var_GetBool( p_enc, SOUT_CFG_PREFIX "intra-refresh" );
 
     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" );
-    if( strcmp( psz_val, "none" ) )
+    if( !strcmp( psz_val, "normal" ) )
     {
-       if ( !strcmp( psz_val, "strict" ) )
-       {
-          p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT;
-       } else if ( !strcmp( psz_val, "normal" ) )
-       {
-          p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
-       }
+        p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
+    }
+    else if ( !strcmp( psz_val, "strict" ) )
+    {
+        p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT;
+    }
+    else if ( !strcmp( psz_val, "none" ) )
+    {
+        p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
     }
+
     free( psz_val );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "ref" );
@@ -1081,7 +1106,7 @@ static int  Open ( vlc_object_t *p_this )
     }
     free( psz_val );
 
-    if( var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) )
+    if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) )
        p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc,
                                     SOUT_CFG_PREFIX "8x8dct" );
 
@@ -1141,6 +1166,7 @@ static int  Open ( vlc_object_t *p_this )
             p_sys->param.b_cabac = 0;
             p_sys->param.i_bframe = 0;
             p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
+            p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
         }
         else if (!strcasecmp( psz_val, "main" ) )
         {
@@ -1221,6 +1247,9 @@ static int  Open ( vlc_object_t *p_this )
      * difference that well yet*/
     p_sys->param.rc.i_lookahead= var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" );
 
+    /* We don't want repeated headers, we repeat p_extra ourself if needed */
+    p_sys->param.b_repeat_headers = 0;
+
     /* Open the encoder */
     p_sys->h = x264_encoder_open( &p_sys->param );
 
@@ -1264,9 +1293,19 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
     int i_nal=0, i_out=0, i=0;
 
     /* init pic */
+#if X264_BUILD >= 98
+    x264_picture_init( &pic );
+#else
     memset( &pic, 0, sizeof( x264_picture_t ) );
+#endif
     if( likely(p_pict) ) {
        pic.i_pts = p_pict->date;
+       /* scale pts starting from 0 as libx264 seems to return dts values
+          assume that
+        */
+       if( unlikely( p_sys->i_initial_delay == 0 ) )
+           p_sys->i_initial_delay = p_pict->date;
+       pic.i_pts -= p_sys->i_initial_delay;
        pic.img.i_csp = X264_CSP_I420;
        pic.img.i_plane = p_pict->i_planes;
        for( i = 0; i < p_pict->i_planes; i++ )
@@ -1313,16 +1352,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
         p_enc->fmt_in.video.i_frame_rate_base /
             p_enc->fmt_in.video.i_frame_rate;
 
-    /* libx264 gives pts/dts values from >= 83 onward,
-     * also pts starts from 0 so dts can be negative,
-     * but vlc doesn't handle if dts is < VLC_TS_0 so we
-     * use that offset to get it right for vlc.
-     */
-    if( p_sys->i_initial_delay == 0 && pic.i_dts < VLC_TS_0 )
-    {
-        p_sys->i_initial_delay = -1* pic.i_dts;
-        msg_Dbg( p_enc, "Initial delay is set to %d", p_sys->i_initial_delay );
-    }
+    /* scale pts-values back*/
     p_block->i_pts = pic.i_pts + p_sys->i_initial_delay;
     p_block->i_dts = pic.i_dts + p_sys->i_initial_delay;