More picture info added.

Small cleanup.

CVS patchset: 5042
CVS date: 2003/06/14 01:14:05

1 files changed, 1 insertions, 21 deletions

diff --git a/src/libmpeg2new/libmpeg2/header.c b/src/libmpeg2new/libmpeg2/header.c
index 62c87c700..3c47119be 100644
--- a/src/libmpeg2new/libmpeg2/header.c
+++ b/src/libmpeg2new/libmpeg2/header.c
@@ -93,7 +93,6 @@ static void reset_info (mpeg2_info_t * info)
     info->current_picture = info->current_picture_2nd = NULL;
     info->display_picture = info->display_picture_2nd = NULL;
     info->current_fbuf = info->display_fbuf = info->discard_fbuf = NULL;
-    printf("mpeg2dec:reset_info\n");
     info->user_data = NULL;	info->user_data_len = 0;
 }
 
@@ -366,7 +365,6 @@ void mpeg2_set_fbuf (mpeg2dec_t * mpeg2dec, int coding_type)
 	    mpeg2dec->fbuf[2] != &mpeg2dec->fbuf_alloc[i].fbuf) {
 	    mpeg2dec->fbuf[0] = &mpeg2dec->fbuf_alloc[i].fbuf;
 	    if (!mpeg2dec->custom_fbuf) {
-              printf("mpeg2dec:set_fbuf:NO NO NO!!!\n");
 	      mpeg2dec->info.current_fbuf = mpeg2dec->fbuf[0];
 	      if ((coding_type == B_TYPE) ||
 		  (mpeg2dec->sequence.flags & SEQ_FLAG_LOW_DELAY)) {
@@ -374,7 +372,6 @@ void mpeg2_set_fbuf (mpeg2dec_t * mpeg2dec, int coding_type)
 		  if ((coding_type == B_TYPE) || (mpeg2dec->convert_start)) {
 		      mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[0];
                       mpeg2dec->fbuf[0]=0;
-                      printf("mpeg2dec:set_fbuf:discard_fbuf=fbuf[0]\n");
                   }
 	      }
             }
@@ -460,11 +457,6 @@ int mpeg2_header_picture (mpeg2dec_t * mpeg2dec)
 		    mpeg2dec->fbuf[!low_delay + !mpeg2dec->convert_start];
                 // FIXME: Might want to wipe this whole section, once pictures is sorted. 
                 // mpeg2dec->fbuf[!low_delay + !mpeg2dec->convert_start]=0;
-                printf("mpeg2dec:header_picture:discard_fbuf=??\n");
-                printf("mpeg2dec:header_picture:express = %d\n",!low_delay + !mpeg2dec->convert_start);
-                printf("mpeg2dec:header_picture:fbuf[0]=%p\n", mpeg2dec->fbuf[0]);
-                printf("mpeg2dec:header_picture:fbuf[1]=%p\n", mpeg2dec->fbuf[1]);
-                printf("mpeg2dec:header_picture:fbuf[2]=%p\n", mpeg2dec->fbuf[2]);
             }
 	}
 	if (!mpeg2dec->custom_fbuf) {
@@ -552,6 +544,7 @@ static int picture_coding_ext (mpeg2dec_t * mpeg2dec)
 	picture->nb_fields = 1;
 	break;
     case FRAME_PICTURE:
+        /* buffer[3] & 2 is repeat first field */
 	if (!(mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE)) {
 	    picture->nb_fields = (buffer[3] & 2) ? 3 : 2;
 	    flags |= (buffer[3] & 128) ? PIC_FLAG_TOP_FIELD_FIRST : 0;
@@ -713,7 +706,6 @@ mpeg2_state_t mpeg2_header_slice_start (mpeg2dec_t * mpeg2dec)
 			 mpeg2dec->fbuf[b_type]->buf);
     }
     mpeg2dec->action = NULL;
-    printf("mpeg2dec:action = NULL\n");
     return (mpeg2_state_t)-1;
 }
 
@@ -721,10 +713,8 @@ mpeg2_state_t mpeg2_header_end_btype2 (mpeg2dec_t * mpeg2dec)
 {
 	mpeg2dec->info.display_fbuf = 0;
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[1];
-        printf("mpeg2dec:header_end_btype2:discard_fbuf=1\n");
         mpeg2dec->fbuf[1]=0;
         mpeg2dec->action = mpeg2_seek_sequence;
-        printf("mpeg2dec:action = mpeg2_seek_sequence\n");
         mpeg2dec->first = 1;
         return STATE_END;
 }
@@ -732,10 +722,8 @@ mpeg2_state_t mpeg2_header_end_btype (mpeg2dec_t * mpeg2dec)
 {
 	mpeg2dec->info.display_fbuf = mpeg2dec->fbuf[1];
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[2];
-        printf("mpeg2dec:header_end_btype:discard_fbuf=0\n");
         mpeg2dec->fbuf[2]=0;
         mpeg2dec->action = mpeg2_header_end_btype2;
-        printf("mpeg2dec:action = mpeg2_header_end_btype2\n");
         return STATE_SLICE;
 }
 mpeg2_state_t mpeg2_header_end_itype2 (mpeg2dec_t * mpeg2dec)
@@ -744,7 +732,6 @@ mpeg2_state_t mpeg2_header_end_itype2 (mpeg2dec_t * mpeg2dec)
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[0];
         mpeg2dec->fbuf[0]=0;
         mpeg2dec->action = mpeg2_seek_sequence;
-        printf("mpeg2dec:action = mpeg2_seek_sequence\n");
         mpeg2dec->first = 1;
         return STATE_END;
 }
@@ -754,7 +741,6 @@ mpeg2_state_t mpeg2_header_end_itype (mpeg2dec_t * mpeg2dec)
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[1];
         mpeg2dec->fbuf[1]=0;
         mpeg2dec->action = mpeg2_header_end_itype2;
-        printf("mpeg2dec:action = mpeg2_header_end_itype2\n");
         return STATE_SLICE;
 }
 
@@ -778,7 +764,6 @@ mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec)
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[0];
         mpeg2dec->fbuf[0]=0;
         mpeg2dec->action = mpeg2_header_end_btype;
-        printf("mpeg2dec:action = mpeg2_header_end_btype\n");
         return STATE_SLICE;
     } else {
 	mpeg2dec->info.display_picture = picture;
@@ -789,14 +774,12 @@ mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec)
 	  mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[2];
           mpeg2dec->fbuf[2]=0;
           mpeg2dec->action = mpeg2_header_end_itype;
-          printf("mpeg2dec:action = mpeg2_header_end_itype\n");
           return STATE_SLICE;
         } else {
           mpeg2dec->info.display_fbuf = mpeg2dec->fbuf[0];
 	  mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[1];
           mpeg2dec->fbuf[1]=0;
           mpeg2dec->action = mpeg2_header_end_itype2;
-          printf("mpeg2dec:action = mpeg2_header_end_itype2\n");
           return STATE_SLICE;
         }
 
@@ -811,14 +794,11 @@ mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec)
 	mpeg2dec->info.display_fbuf = mpeg2dec->fbuf[b_type];
 	if (!mpeg2dec->convert_start) {
 	    mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[b_type + 1];
-            printf("mpeg2dec:header_end:discard_fbuf=b_type+1\n");
         }
     } else if (!mpeg2dec->convert_start) {
 	mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[b_type];
-        printf("mpeg2dec:header_end:discard_fbuf=b_type\n");
     }
     mpeg2dec->action = mpeg2_seek_sequence;
-    printf("mpeg2dec:action = mpeg2_seek_sequence\n");
     mpeg2dec->first = 1;
     return STATE_END;
 #endif