[vlc-commits] commit: x264.c: handle dts/pts from libx264 on X264_BUILD >= 83 onward ( Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Ilkka Ollakka <ileoo at iki.fi> | Fri Jan 15 16:45:37 2010 +0200| [cd5730996b6d065e1d3f24184616831eb5436053] | committer: Ilkka Ollakka 

x264.c: handle dts/pts from libx264 on X264_BUILD >= 83 onward

libx264 gives dts-value, but we need to calculate initial delay, so dts doesn't
go < VLC_TS_0.

Tell how many frames are still left on libx264 buffer when we close encoder

Only set BLOCK_FLAG_TYPE_I on IDR-frames on X264_BUILD < 83 and only those
which have b_keyframe on X264_BUILD >= 83.

(cherry picked from commit e3e7caad7c386d8e54db9a61529b769131cf5ba8)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=cd5730996b6d065e1d3f24184616831eb5436053
---

 modules/codec/x264.c |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 3b91a51..156a97c 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -802,7 +802,11 @@ struct encoder_sys_t
     int             i_buffer;
     uint8_t         *p_buffer;
 
+#if X264_BUILD >= 83
+    int  i_initial_delay;
+#else
     mtime_t         i_interpolated_dts;
+#endif
 
     char *psz_stat_name;
 };
@@ -859,7 +863,11 @@ static int  Open ( vlc_object_t *p_this )
     p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
+#if X264_BUILD >= 83
+    p_sys->i_initial_delay = 0;
+#else
     p_sys->i_interpolated_dts = 0;
+#endif
     p_sys->psz_stat_name = NULL;
     p_sys->p_buffer = NULL;
 
@@ -1547,18 +1555,47 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
     if( !p_block ) return NULL;
     memcpy( p_block->p_buffer, p_sys->p_buffer, i_out );
 
-    if( pic.i_type == X264_TYPE_IDR || pic.i_type == X264_TYPE_I )
+#if X264_BUILD >= 83
+    if( pic.b_keyframe )
         p_block->i_flags |= BLOCK_FLAG_TYPE_I;
-    else if( pic.i_type == X264_TYPE_P )
+#else
+     /* We only set IDR-frames as type_i as packetizer
+      * places sps/pps on keyframes and we don't want it
+      * to place sps/pps stuff with normal I-frames.
+      * FIXME: This is a workaround and should be fixed when
+      * there is some nice way to tell packetizer what is
+      * keyframe.
+      */
+    if( pic.i_type == X264_TYPE_IDR )
+        p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+#endif
+    else if( pic.i_type == X264_TYPE_P || pic.i_type == X264_TYPE_I )
         p_block->i_flags |= BLOCK_FLAG_TYPE_P;
     else if( pic.i_type == X264_TYPE_B )
         p_block->i_flags |= BLOCK_FLAG_TYPE_B;
+    else
+        p_block->i_flags |= BLOCK_FLAG_TYPE_PB;
 
     /* This isn't really valid for streams with B-frames */
     p_block->i_length = INT64_C(1000000) *
         p_enc->fmt_in.video.i_frame_rate_base /
             p_enc->fmt_in.video.i_frame_rate;
 
+#if X264_BUILD >= 83
+    /* 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 );
+    }
+    p_block->i_pts = pic.i_pts + p_sys->i_initial_delay;
+    p_block->i_dts = pic.i_dts + p_sys->i_initial_delay;
+#else
+
     p_block->i_pts = pic.i_pts;
 
     if( p_sys->param.i_bframe > 0 )
@@ -1588,6 +1625,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
     {
         p_block->i_dts = p_block->i_pts;
     }
+#endif
 
     return p_block;
 }
@@ -1602,6 +1640,8 @@ static void Close( vlc_object_t *p_this )
 
     free( p_sys->psz_stat_name );
 
+    msg_Dbg( p_enc, "framecount still in libx264 buffer: %d", x264_encoder_delayed_frames( p_sys->h ) );
+
     if( p_sys->h )
         x264_encoder_close( p_sys->h );