Fix blockiness after seeking MPEG-2 streams

CVS patchset: 4287
CVS date: 2003/02/26 06:49:23

2 files changed, 9 insertions, 2 deletions

diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index 0e511fc77..f1ee8a14c 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -72,6 +72,7 @@ void mpeg2_init (mpeg2dec_t * mpeg2dec)
 
     mpeg2dec->shift = 0xffffff00;
     mpeg2dec->is_sequence_needed = 1;
+    mpeg2dec->is_wait_for_ip_frames = 2;
     mpeg2dec->frames_to_drop = 0;
     mpeg2dec->drop_frame = 0;
     mpeg2dec->in_slice = 0;
@@ -248,8 +249,13 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code,
 	if (((picture->picture_structure == FRAME_PICTURE) ||
 	     (picture->second_field)) ) {
 	  
-	  if (mpeg2dec->drop_frame)
+	  if (mpeg2dec->drop_frame ||
+	      (picture->picture_coding_type == B_TYPE && mpeg2dec->is_wait_for_ip_frames > 0) ||
+	      (picture->picture_coding_type == P_TYPE && mpeg2dec->is_wait_for_ip_frames > 1)) {
 	    picture->current_frame->bad_frame = 1;
+	  } else if (picture->picture_coding_type != D_TYPE && mpeg2dec->is_wait_for_ip_frames > 0) {
+	    mpeg2dec->is_wait_for_ip_frames--;
+	  }
    
 	  if (picture->picture_coding_type == B_TYPE) {
 	    if( picture->current_frame && !picture->current_frame->drawn ) {
@@ -589,7 +595,7 @@ void mpeg2_reset (mpeg2dec_t * mpeg2dec) {
   mpeg2_discontinuity(mpeg2dec);
   
   if( !picture->mpeg1 ) 
-    mpeg2dec->is_sequence_needed = 1;
+    mpeg2dec->is_wait_for_ip_frames = 2;
   else {
     /* to free reference frames one also needs to fix slice.c to 
      * abort when they are NULL. unfortunately it seems to break
diff --git a/src/libmpeg2/mpeg2.h b/src/libmpeg2/mpeg2.h
index 8cb0070b0..bb3ef96d5 100644
--- a/src/libmpeg2/mpeg2.h
+++ b/src/libmpeg2/mpeg2.h
@@ -27,6 +27,7 @@ typedef struct mpeg2dec_s {
     
     uint32_t shift;
     int is_sequence_needed;
+    int is_wait_for_ip_frames;
     int frames_to_drop, drop_frame;
     int in_slice;
     int seek_mode, is_frame_needed;