Changeset a1bf965dd5248902f24b0d0ee5279b5f758db02d

Timestamp:

06/10/06 00:20:11 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1149891611 +0000

git-parent:

[31a2d53b0aa1e4e8f929471e8760043aa65c50e4]

git-author:

Gildas Bazin <gbazin@videolan.org> 1149891611 +0000

Message:

* modules/packetizer/mpeg4video.c: rewrite using the block helper facility. Fixes a few issues with the previous packetizer and is simpler.

Files:

• modules/packetizer/mpeg4video.c (modified) (13 diffs)

modules/packetizer/mpeg4video.c

@@ -2 +2 @@
- * mpeg4video.c: mpeg 4 video packetizer
- *****************************************************************************
-, 2002, 
+-
- * $Id$
- *
-
+
+
- *          Eric Petit <titer@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
-
-#include "vlc_bits.h"
+#include "vlc_block_helper.h"
-
-/*****************************************************************************
@@ -50 +51 @@
-vlc_module_end();
-
-
-/****************************************************************************
- * Local prototypes
@@ -58 +58 @@
-struct decoder_sys_t
-{
+    /*
+     * Input properties
+     */
+    block_bytestream_t bytestream;
+    int i_state;
+    int i_offset;
+    uint8_t p_startcode[3];
+
-    /*
-     * Common properties
@@ -69 +77 @@
-    mtime_t i_last_timeincr;
-
-    vlc_bool_t  b_vop;
-    int         i_buffer;
-    int         i_buffer_size;
-    uint8_t     *p_buffer;
-    unsigned int i_flags;
-
@@ -81 +85 @@
-
-    vlc_bool_t  b_frame;
+
+    /* Current frame being built */
+    block_t    *p_frame;
+    block_t    **pp_last;
-};
-
-
-
+
+
+
+
+
+
+
+
-static int vlc_log2( unsigned int );
-
@@ -148 +162 @@
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
-
+    /* Misc init */
+    p_sys->i_state = STATE_NOSYNC;
+    p_sys->bytestream = block_BytestreamInit( p_dec );
+    p_sys->p_startcode[0] = 0;
+    p_sys->p_startcode[1] = 0;
+    p_sys->p_startcode[2] = 1;
+    p_sys->i_offset = 0;
+    p_sys->p_frame = NULL;
+    p_sys->pp_last = &p_sys->p_frame;
+
-    /* Setup properties */
-    es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
@@ -161 +185 @@
-
-        msg_Dbg( p_dec, "opening with vol size: %d", p_dec->fmt_in.i_extra );
-m4v_VOLParse
-    
+ParseVOL
+
-    }
-    else
@@ -184 +208 @@
-    decoder_t *p_dec = (decoder_t*)p_this;
-
-
+
+
-    free( p_dec->p_sys );
-}
@@ -194 +219 @@
-{
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- *  TODO:
- *      - support aspect ratio
- */
-
-
-
+
+
+
+
+
-    bs_t s;
-    int i_vo_type;
-    int i_vo_ver_id;
-    int i_ar;
-    int i_shape;
-
-    for( ;; )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    bs_init( &s, &p_vol[4], i_vol - 4 );
-
@@ -545 +454 @@
-    if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
-
-dec->p_
-dec->p_sys->i_fps_num ) p_dec->
+
+sys->i_fps_num ) 
-
-    if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
@@ -552 +461 @@
-    if( bs_read1( &s ) )
-    {
-
-
+
-
-        if( i_time_increment_bits < 1 ) i_time_increment_bits = 1;
-
-dec->p_
+
-    }
-    if( i_shape == 0 )
@@ -567 +475 @@
-        bs_skip( &s, 1 );
-    }
+
-    return VLC_SUCCESS;
-}
+
+static int ParseVOP( decoder_t *p_dec, block_t *p_vop )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    int64_t i_time_increment, i_time_ref;
+    int i_modulo_time_base = 0, i_time_increment_bits;
+    bs_t s;
+
+    bs_init( &s, &p_vop->p_buffer[4], p_vop->i_buffer - 4 );
+
+    switch( bs_read( &s, 2 ) )
+    {
+    case 0:
+        p_sys->i_flags = BLOCK_FLAG_TYPE_I;
+        break;
+    case 1:
+        p_sys->i_flags = BLOCK_FLAG_TYPE_P;
+        break;
+    case 2:
+        p_sys->i_flags = BLOCK_FLAG_TYPE_B;
+        p_sys->b_frame = VLC_TRUE;
+        break;
+    case 3: /* gni ? */
+        p_sys->i_flags = BLOCK_FLAG_TYPE_PB;
+        break;
+    }
+
+    while( bs_read( &s, 1 ) ) i_modulo_time_base++;
+    if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
+
+    /* VOP time increment */
+    i_time_increment_bits = vlc_log2(p_dec->p_sys->i_fps_num - 1) + 1;
+    if( i_time_increment_bits < 1 ) i_time_increment_bits = 1;
+    i_time_increment = bs_read( &s, i_time_increment_bits );
+
+    /* Interpolate PTS/DTS */
+    if( !(p_sys->i_flags & BLOCK_FLAG_TYPE_B) )
+    {
+        p_sys->i_last_time_ref = p_sys->i_time_ref;
+        p_sys->i_time_ref +=
+            (i_modulo_time_base * p_dec->p_sys->i_fps_num);
+        i_time_ref = p_sys->i_time_ref;
+    }
+    else
+    {
+        i_time_ref = p_sys->i_last_time_ref +
+            (i_modulo_time_base * p_dec->p_sys->i_fps_num);
+    }
+
+#if 0
+    msg_Err( p_dec, "interp pts/dts (%lli,%lli), pts/dts (%lli,%lli)",
+             p_sys->i_interpolated_pts, p_sys->i_interpolated_dts,
+             p_vop->i_pts, p_vop->i_dts );
+#endif
+
+    if( p_dec->p_sys->i_fps_num < 5 && /* Work-around buggy streams */
+        p_dec->fmt_in.video.i_frame_rate > 0 &&
+        p_dec->fmt_in.video.i_frame_rate_base > 0 )
+    {
+        p_sys->i_interpolated_pts += I64C(1000000) *
+        p_dec->fmt_in.video.i_frame_rate_base *
+        p_vop->i_rate / INPUT_RATE_DEFAULT /
+        p_dec->fmt_in.video.i_frame_rate;
+    }
+    else if( p_dec->p_sys->i_fps_num )
+        p_sys->i_interpolated_pts +=
+            ( I64C(1000000) * (i_time_ref + i_time_increment -
+              p_sys->i_last_time - p_sys->i_last_timeincr) *
+              p_vop->i_rate / INPUT_RATE_DEFAULT /
+              p_dec->p_sys->i_fps_num );
+
+    p_sys->i_last_time = i_time_ref;
+    p_sys->i_last_timeincr = i_time_increment;
+
+    /* Correct interpolated dts when we receive a new pts/dts */
+    if( p_vop->i_pts > 0 )
+        p_sys->i_interpolated_pts = p_vop->i_pts;
+    if( p_vop->i_dts > 0 )
+        p_sys->i_interpolated_dts = p_vop->i_dts;
+
+    if( (p_sys->i_flags & BLOCK_FLAG_TYPE_B) || !p_sys->b_frame )
+    {
+        /* Trivial case (DTS == PTS) */
+
+        p_sys->i_interpolated_dts = p_sys->i_interpolated_pts;
+
+        if( p_vop->i_pts > 0 )
+            p_sys->i_interpolated_dts = p_vop->i_pts;
+        if( p_vop->i_dts > 0 )
+            p_sys->i_interpolated_dts = p_vop->i_dts;
+
+        p_sys->i_interpolated_pts = p_sys->i_interpolated_dts;
+    }
+    else
+    {
+        if( p_sys->i_last_ref_pts > 0 )
+            p_sys->i_interpolated_dts = p_sys->i_last_ref_pts;
+
+        p_sys->i_last_ref_pts = p_sys->i_interpolated_pts;
+    }
+
+    return VLC_SUCCESS;
+}
+
+/* look at ffmpeg av_log2 ;) */
+static int vlc_log2( unsigned int v )
+{
+    int n = 0;
+    static const int vlc_log2_table[16] =
+    {
+        0,0,1,1,2,2,2,2, 3,3,3,3,3,3,3,3
+    };
+
+    if( v&0xffff0000 )
+    {
+        v >>= 16;
+        n += 16;
+    }
+    if( v&0xff00 )
+    {
+        v >>= 8;
+        n += 8;
+    }
+    if( v&0xf0 )
+    {
+        v >>= 4;
+        n += 4;
+    }
+    n += vlc_log2_table[v];
+
+    return n;
+}