Changeset 09eaac810866232ee437516ca2a8fb6bcfd8b523

Timestamp:

03/02/07 20:51:20 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[b5d7934fc8bb26f7f92ddfcea76485e34bc953e2]

git-author:

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

Message:

Packetizers should trash all blocks with DISCONTINUITY or CORRUPTED flag set.

As a side effect, this workaround the AAC decoding problem after pause/seek
when going through our packetizer (eg: pause/seek with vlc VOD).

But the bug is still there : faad will stop decoding audio forever after
receiving a buffer full of 0 (at least with faad2-2.5 from
audiocoding.com, faad2 from mplayer svn does not show this problem)

Files:

• modules/packetizer/copy.c (modified) (2 diffs)
• modules/packetizer/h264.c (modified) (2 diffs)
• modules/packetizer/mpeg4audio.c (modified) (2 diffs)
• modules/packetizer/mpeg4video.c (modified) (1 diff)
• modules/packetizer/vc1.c (modified) (1 diff)

modules/packetizer/copy.c

@@ -257 +257 @@
-
-    if( pp_block == NULL || *pp_block == NULL )
-
-
-
+
+
+
+
+
+
+
-    p_block = *pp_block;
-    *pp_block = NULL;
@@ -292 +296 @@
-
-    if( pp_block == NULL || *pp_block == NULL )
-
-
-
+
+
+
+
+
+
+
-    p_block = *pp_block;
-    *pp_block = NULL;

modules/packetizer/h264.c

@@ -312 +312 @@
-    block_t       *p_pic;
-
-
+
+
+
+
+
+
+
+
-
-    block_BytestreamPush( &p_sys->bytestream, *pp_block );
@@ -401 +408 @@
-    uint8_t       *p;
-
-
+
+
+
+
+
+
+
-
-    p_block = *pp_block;

modules/packetizer/mpeg4audio.c

@@ -217 +217 @@
-    if( !pp_block || !*pp_block ) return NULL;
-
+    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        block_Release( *pp_block );
+        return NULL;
+    }
+
-    p_block = *pp_block;
-    *pp_block = NULL; /* Don't reuse this block */
@@ -258 +264 @@
-        return NULL;
-    }
-
-
+
-    {
-        p_sys->i_state = STATE_NOSYNC;
+        block_Release( *pp_block );
+        return NULL;
-    }
-

modules/packetizer/mpeg4video.c

@@ -225 +225 @@
-    if( pp_block == NULL || *pp_block == NULL ) return NULL;
-
-BLOCK_FLAG_DISCONTINUITY
+(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED)
-    {
-        p_sys->i_state = STATE_NOSYNC;

modules/packetizer/vc1.c

@@ -195 +195 @@
-        return NULL;
-
-
-
-
-
-
-
+
-    {
-        p_sys->i_state = STATE_NOSYNC;