[Mplayer-cvslog] CVS: main/libmpeg2 header.c,1.8,1.9

[Ivan Kalvachev]

Update of /cvsroot/mplayer/main/libmpeg2
In directory mplayer:/var/tmp.root/cvs-serv13380

Modified Files:
	header.c 
Log Message:
arpi's display_time + interlace hack

Index: header.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/header.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- header.c	28 Oct 2001 23:57:11 -0000	1.8
+++ header.c	30 Oct 2001 17:29:27 -0000	1.9
@@ -203,7 +203,6 @@
     picture->repeat_first_field = (buffer[3] >> 1) & 1;
     picture->progressive_frame = buffer[4] >> 7;
 
-#if 1
     // repeat_first implementation by A'rpi/ESP-team, based on libmpeg3:
     picture->display_time=100;
     if(picture->repeat_first_field){
@@ -217,32 +216,9 @@
                 picture->display_time+=50;
         }
     }
-    //repeat_count=display_time-100%
-#else
-
-
-   // repeat_first implemantation by iive, based on A'rpi/ESP-team and libmpeg3
-    if( picture->progressive_sequence == 1 )
-    {
-        if( picture->repeat_first_field == 0 ) picture->display_time=100;//normal
-	else
-	{
-	    if( picture->top_field_first == 0 ) picture->display_time=200;//2 frames
-	    else picture->display_time=300;//3 frames
-	}
-    }else
-    {
-         if( picture->progressive_frame == 0 )
-	     picture->display_time=100;//2fields, interlaced in time
-	 else
-	 {
-	     if( picture->top_field_first == 0 ) picture->display_time=150;//reconstruct 2 fields
-	     else picture->display_time = 150;//reconstruct 3 fields
-	 }
-
-	 if( picture->picture_structure!=3 ) picture->display_time/=2;//we calc on every field
-    }
-#endif
+    //temopral hack. We calc time on every field, so if we have 2 fields
+    // interlaced we'll end with double time for 1 frame
+    if( picture->picture_structure!=3 ) picture->display_time/=2;
     return 0;
 }