codec: don't drop discontinue blocks

Signed-off-by: Jean-Paul Saman <[email protected]>

modules/codec/a52.c

@@ -174,7 +174,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     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) )
     {
         if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
         {
@@ -185,6 +185,10 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         block_Release( *pp_block );
         return NULL;
     }
+    if( (*pp_block)->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    {
+        date_Set( &p_sys->end_date, 0 );
+    }
 
     if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID)
     {

modules/codec/avcodec/audio.c

@@ -261,7 +261,7 @@ static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
     if( p_sys->b_delayed_open )
         goto end;
 
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
     {
         avcodec_flush_buffers( ctx );
         date_Set( &p_sys->end_date, VLC_TS_INVALID );
@@ -272,6 +272,11 @@ static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
 
         goto end;
     }
+    if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    {
+        avcodec_flush_buffers( ctx );
+        date_Set( &p_sys->end_date, VLC_TS_INVALID );
+    }
 
     /* We've just started the stream, wait for the first PTS. */
     if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TS_INVALID )

modules/codec/avcodec/subtitle.c

@@ -124,11 +124,13 @@ static subpicture_t *DecodeSubtitle(decoder_t *dec, block_t **block_ptr)
 
     block_t *block = *block_ptr;
 
-    if (block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED)) {
+    if (block->i_flags & (BLOCK_FLAG_CORRUPTED)) {
         block_Release(block);
         avcodec_flush_buffers(sys->p_context);
         return NULL;
     }
+    if (block->i_flags & BLOCK_FLAG_DISCONTINUITY)
+        avcodec_flush_buffers(sys->p_context);
 
     if (block->i_buffer <= 0) {
         block_Release(block);

modules/codec/bpg.c

@@ -102,7 +102,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     p_block = *pp_block;
 
-    if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
     {
         block_Release(p_block);
         *pp_block = NULL;

modules/codec/cdg.c

@@ -143,7 +143,7 @@ static picture_t *Decode( decoder_t *p_dec, block_t **pp_block )
         return NULL;
     p_block = *pp_block;
 
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
     {
         p_sys->i_packet = 0;
         goto exit;

modules/codec/crystalhd.c

@@ -443,7 +443,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     if( p_block )
     {
-        if( ( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) == 0 )
+        if( ( p_block->i_flags&(BLOCK_FLAG_CORRUPTED) ) == 0 )
         {
             /* Valid input block, so we can send to HW to decode */
 

modules/codec/daala.c

@@ -404,7 +404,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     block_t *p_block = *pp_block;
     void *p_buf;
 
-    if( ( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) != 0 )
+    if( ( p_block->i_flags&(BLOCK_FLAG_CORRUPTED) ) != 0 )
     {
         /* Don't send the the first packet after a discontinuity to
          * daala_decode, otherwise we get purple/green display artifacts

modules/codec/ddummy.c

@@ -130,7 +130,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     if( stream != NULL
      && p_block->i_buffer > 0
-     && !(p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED)) )
+     && !(p_block->i_flags & (BLOCK_FLAG_CORRUPTED)) )
     {
         fwrite( p_block->p_buffer, 1, p_block->i_buffer, stream );
         msg_Dbg( p_dec, "dumped %zu bytes", p_block->i_buffer );

modules/codec/dts.c

@@ -174,17 +174,16 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     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) )
     {
-        if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
-        {
-            p_sys->i_state = STATE_NOSYNC;
-            block_BytestreamEmpty( &p_sys->bytestream );
-        }
+        p_sys->i_state = STATE_NOSYNC;
+        block_BytestreamEmpty( &p_sys->bytestream );
         date_Set( &p_sys->end_date, 0 );
         block_Release( *pp_block );
         return NULL;
     }
+    if( (*pp_block)->i_flags & BLOCK_FLAG_DISCONTINUITY )
+        date_Set( &p_sys->end_date, 0 );
 
     if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID )
     {

modules/codec/faad.c

@@ -210,7 +210,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     p_block = *pp_block;
 
-    if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags&(BLOCK_FLAG_CORRUPTED) )
     {
         block_Release( p_block );
         return NULL;

modules/codec/flac.c

@@ -500,7 +500,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     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) )
     {
         block_Release( *pp_block );
         return NULL;

modules/codec/gstdecode.c

@@ -679,8 +679,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             p_sys->b_prerolled = false;
         }
 
-        block_Release( p_block );
-        goto done;
+        if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
+        {
+            block_Release( p_block );
+            goto done;
+        }
     }
 
     if( likely( p_block->i_buffer ) )

modules/codec/jpeg.c

@@ -199,7 +199,7 @@ static picture_t *DecodeBlock(decoder_t *p_dec, block_t **pp_block)
 
     p_block = *pp_block;
 
-    if (p_block->i_flags & BLOCK_FLAG_DISCONTINUITY)
+    if (p_block->i_flags & BLOCK_FLAG_CORRUPTED )
     {
         block_Release(p_block);
         *pp_block = NULL;

modules/codec/kate.c

@@ -480,9 +480,12 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             vlc_mutex_unlock( &p_sys->lock );
         }
 #endif
-        p_sys->i_max_stop = VLC_TS_INVALID;
-        block_Release( p_block );
-        return NULL;
+        if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
+        {
+            p_sys->i_max_stop = VLC_TS_INVALID;
+            block_Release( p_block );
+            return NULL;
+        }
     }
 
     /* Block to Kate packet */

modules/codec/libass.c

@@ -307,7 +307,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         return NULL;
 
     p_block = *pp_block;
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
     {
         p_sys->i_max_stop = VLC_TS_INVALID;
         block_Release( p_block );

modules/codec/libmpeg2.c

@@ -261,7 +261,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         return NULL;
 
     p_block = *pp_block;
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
         Reset( p_dec );
 
     while( 1 )

modules/codec/mft.c

@@ -777,7 +777,7 @@ static void *DecodeSync(decoder_t *p_dec, block_t **pp_block)
         return NULL;
 
     block_t *p_block = *pp_block;
-    if (p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED))
+    if (p_block->i_flags & (BLOCK_FLAG_CORRUPTED))
     {
         block_Release(p_block);
         return NULL;
@@ -839,10 +839,9 @@ static void *DecodeAsync(decoder_t *p_dec, block_t **pp_block)
         return NULL;
 
     block_t *p_block = *pp_block;
-    if (p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED))
+    if (p_block->i_flags & (BLOCK_FLAG_CORRUPTED))
     {
         block_Release(p_block);
-
         return NULL;
     }
 

modules/codec/mpeg_audio.c

@@ -201,18 +201,19 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     block_t *p_block = pp_block ? *pp_block : NULL;
 
     if (p_block) {
-        if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+        if( p_block->i_flags&(BLOCK_FLAG_CORRUPTED) )
         {
-            if( p_block->i_flags&BLOCK_FLAG_CORRUPTED )
-            {
-                p_sys->i_state = STATE_NOSYNC;
-                block_BytestreamEmpty( &p_sys->bytestream );
-            }
+            p_sys->i_state = STATE_NOSYNC;
+            block_BytestreamEmpty( &p_sys->bytestream );
             date_Set( &p_sys->end_date, 0 );
             block_Release( p_block );
-            p_sys->b_discontinuity = true;
             return NULL;
         }
+        if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+        {
+            date_Set( &p_sys->end_date, 0 );
+            p_sys->b_discontinuity = true;
+        }
 
         if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TS_INVALID )
         {
@@ -292,7 +293,6 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 msg_Dbg( p_dec, "emulated startcode" );
                 block_SkipByte( &p_sys->bytestream );
                 p_sys->i_state = STATE_NOSYNC;
-                p_sys->b_discontinuity = true;
                 break;
             }
 
@@ -367,7 +367,6 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                     msg_Dbg( p_dec, "emulated startcode on next frame" );
                     block_SkipByte( &p_sys->bytestream );
                     p_sys->i_state = STATE_NOSYNC;
-                    p_sys->b_discontinuity = true;
                     break;
                 }
 

modules/codec/mpg123.c

@@ -93,7 +93,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         goto error;
     }
 
-    if( p_block->i_flags & ( BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED ) )
+    if( p_block->i_flags & ( BLOCK_FLAG_CORRUPTED ) )
     {
         date_Set( &p_sys->end_date, 0 );
         goto error;

modules/codec/png.c

@@ -205,7 +205,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     p_sys->b_error = false;
 
-    if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
     {
         block_Release( p_block ); *pp_block = NULL;
         return NULL;

modules/codec/scte27.c

@@ -416,7 +416,7 @@ static subpicture_t *Decode(decoder_t *dec, block_t **block)
     subpicture_t *sub_first = NULL;
     subpicture_t **sub_last = &sub_first;
 
-    if (b->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED))
+    if (b->i_flags & (BLOCK_FLAG_CORRUPTED))
         goto exit;
 
     while (b->i_buffer > 3) {

modules/codec/sdl_image.c

@@ -137,7 +137,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     if( pp_block == NULL || *pp_block == NULL ) return NULL;
     p_block = *pp_block;
 
-    if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
     {
         block_Release( p_block ); *pp_block = NULL;
         return NULL;

modules/codec/stl.c

@@ -113,7 +113,7 @@ static subpicture_t *Decode(decoder_t *dec, block_t **block)
     subpicture_t *sub = NULL;
 
     block_t *b = *block; *block = NULL;
-    if (b->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED))
+    if (b->i_flags & (BLOCK_FLAG_CORRUPTED))
         goto exit;
     if (b->i_buffer < 128)
         goto exit;

modules/codec/subsdec.c

@@ -329,7 +329,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         return NULL;
 
     p_block = *pp_block;
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
     {
         block_Release( p_block );
         return NULL;

modules/codec/substx3g.c

@@ -282,7 +282,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     *pp_block = NULL;
 
-    if( ( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) ||
+    if( ( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) ) ||
           p_block->i_buffer < sizeof(uint16_t) )
     {
         block_Release( p_block );

modules/codec/svcdsub.c

@@ -234,7 +234,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
     uint16_t i_expected_image;
     uint8_t  i_packet, i_expected_packet;
 
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
     {
         block_Release( p_block );
         return NULL;

modules/codec/svg.c

@@ -136,7 +136,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     *pp_block = NULL;
 
-    if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+    if( p_block->i_flags & BLOCK_FLAG_CORRUPTED)
     {
         block_Release( p_block );
         return NULL;

modules/codec/uleaddvaudio.c

@@ -62,13 +62,14 @@ static block_t *Decode(decoder_t *dec, block_t **block_ptr)
         return NULL;
 
     block_t *block = *block_ptr;
-    if (block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED)) {
-        if (block->i_flags & BLOCK_FLAG_CORRUPTED) {
-        }
+    if (block->i_flags & BLOCK_FLAG_CORRUPTED) {
         date_Set(&sys->end_date, 0);
         block_Release(block);
         return NULL;
     }
+    if (block->i_flags & BLOCK_FLAG_DISCONTINUITY) {
+        date_Set(&sys->end_date, 0);
+    }
 
     if (block->i_pts > VLC_TS_INVALID &&
         block->i_pts != date_Get(&sys->end_date))

modules/codec/videotoolbox.m

@@ -931,7 +931,7 @@ static void copy420YpCbCr8Planar(picture_t *p_pic,
     p_block = *pp_block;
 
     if (likely(p_block != NULL)) {
-        if (unlikely(p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED))) {
+        if (unlikely(p_block->i_flags&(BLOCK_FLAG_CORRUPTED))) {
             if (likely(p_sys->b_started)) {
                 @synchronized(p_sys->outputTimeStamps) {
                     [p_sys->outputTimeStamps removeAllObjects];

modules/codec/vpx.c

@@ -72,7 +72,7 @@ static picture_t *Decode(decoder_t *dec, block_t **pp_block)
     if (!block)
         return NULL;
 
-    if (block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED))
+    if (block->i_flags & (BLOCK_FLAG_CORRUPTED))
         return NULL;
 
     /* Associate packet PTS with decoded frame */