Changeset ab1b0ebec326fae87388c7904c952e827acffe50

Timestamp:

05/30/07 19:36:36 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1180546596 +0000

git-parent:

[07ed62b5a83261ca6692ddf18144932981c6e715]

git-author:

Laurent Aimar <fenrir@videolan.org> 1180546596 +0000

Message:

Improved BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED handling in packetizers.
(I do not reset timestamp on purpose, it will at least break demuxer using
packetizer)

Files:

• modules/codec/a52.c (modified) (2 diffs)
• modules/codec/dts.c (modified) (2 diffs)
• modules/codec/flac.c (modified) (2 diffs)
• modules/codec/mpeg_audio.c (modified) (2 diffs)
• modules/packetizer/h264.c (modified) (1 diff)
• modules/packetizer/mpeg4audio.c (modified) (2 diffs)
• modules/packetizer/mpeg4video.c (modified) (1 diff)
• modules/packetizer/mpegvideo.c (modified) (3 diffs)
• modules/packetizer/vc1.c (modified) (1 diff)

modules/codec/a52.c

@@ -169 +169 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
+    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+        {
+            p_sys->i_state = STATE_NOSYNC;
+            block_BytestreamFlush( &p_sys->bytestream );
+        }
+//        aout_DateSet( &p_sys->end_date, 0 );
+        block_Release( *pp_block );
+        return NULL;
+    }
+
-    if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
-    {
@@ -174 +186 @@
-        block_Release( *pp_block );
-        return NULL;
-    }
-
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
-        p_sys->i_state = STATE_NOSYNC;
-    }
-

modules/codec/dts.c

@@ -171 +171 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
+    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+        {
+            p_sys->i_state = STATE_NOSYNC;
+            block_BytestreamFlush( &p_sys->bytestream );
+        }
+//        aout_DateSet( &p_sys->end_date, 0 );
+        block_Release( *pp_block );
+        return NULL;
+    }
+
-    if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
-    {
@@ -176 +188 @@
-        block_Release( *pp_block );
-        return NULL;
-    }
-
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
-        p_sys->i_state = STATE_NOSYNC;
-    }
-

modules/codec/flac.c

@@ -377 +377 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
+    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+        {
+            p_sys->i_state = STATE_NOSYNC;
+            block_BytestreamFlush( &p_sys->bytestream );
+        }
+//        aout_DateSet( &p_sys->end_date, 0 );
+        block_Release( *pp_block );
+        return NULL;
+    }
+
-    if( !p_sys->b_stream_info ) ProcessHeader( p_dec );
-
@@ -395 +407 @@
-        /* The first PTS is as good as anything else. */
-        aout_DateSet( &p_sys->end_date, (*pp_block)->i_pts );
-    }
-
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
-        p_sys->i_state = STATE_NOSYNC;
-    }
-

modules/codec/mpeg_audio.c

@@ -197 +197 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
+    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
+        {
+            p_sys->i_state = STATE_NOSYNC;
+            block_BytestreamFlush( &p_sys->bytestream );
+        }
+//        aout_DateSet( &p_sys->end_date, 0 );
+        block_Release( *pp_block );
+        return NULL;
+    }
+
-    if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
-    {
@@ -203 +215 @@
-        block_Release( *pp_block );
-        return NULL;
-    }
-
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
-        p_sys->i_state = STATE_NOSYNC;
-    }
-

modules/packetizer/h264.c

@@ -314 +314 @@
-    if( !pp_block || !*pp_block )
-        return NULL;
+
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
-
+
+
+
+
+
+
+
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;

modules/packetizer/mpeg4audio.c

@@ -219 +219 @@
-    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
-    {
+        //aout_DateSet( &p_sys->end_date, 0 );
-        block_Release( *pp_block );
-        return NULL;
@@ -258 +259 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
-
-
-
+
+
+
+
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;
-    }
-
-
-
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;

modules/packetizer/mpeg4video.c

@@ -225 +225 @@
-    if( pp_block == NULL || *pp_block == NULL ) return NULL;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;

modules/packetizer/mpegvideo.c

@@ -116 +116 @@
-
-    mtime_t i_interpolated_dts;
-    mtime_t i_old_duration;
-    mtime_t i_last_ref_pts;
-    vlc_bool_t b_second_field;
@@ -184 +183 @@
-
-    p_sys->i_interpolated_dts = 0;
-    p_sys->i_old_duration = 0;
-    p_sys->i_last_ref_pts = 0;
-    p_sys->b_second_field = 0;
@@ -237 +235 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;
-    }
+
-
-    block_BytestreamPush( &p_sys->bytestream, *pp_block );

modules/packetizer/vc1.c

@@ -195 +195 @@
-        return NULL;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        block_Release( *pp_block );
-        return NULL;