[MPlayer-cvslog] CVS: main mencoder.c,1.337,1.338

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13688

Modified Files:
	mencoder.c 
Log Message:
deobfuscate some a/v sync code


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- mencoder.c	17 Feb 2006 01:57:40 -0000	1.337
+++ mencoder.c	19 Feb 2006 04:31:14 -0000	1.338
@@ -1274,29 +1274,30 @@
 // check frame duplicate/drop:
 
 //printf("\r### %5.3f ###\n",v_timer_corr);
+float mux_frametime = (float)mux_v->h.dwScale/mux_v->h.dwRate;
 
-if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate &&
-    (skip_limit<0 || skip_flag<skip_limit) ){
-    v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
+if (v_timer_corr >= mux_frametime && (skip_limit<0 || skip_flag < skip_limit)) {
+    v_timer_corr-=mux_frametime;
     ++skip_flag; // skip
-} else
-while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate &&
-    (skip_limit<0 || (-skip_flag)<skip_limit) ){
-    v_timer_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate;
+}
+while (v_timer_corr <= -mux_frametime && (skip_limit<0 || -skip_flag < skip_limit)) {
+    v_timer_corr+=mux_frametime;
     --skip_flag; // dup
 }
 
-while( (v_pts_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag>0)
- || (v_pts_corr<=-2*(float)mux_v->h.dwScale/mux_v->h.dwRate) ){
-    v_pts_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate;
+// either v_pts_corr is big, more than 2 times framerate, then we follow its advice,
+// or, it cancels out v_timer_corr, in which case be happy and do nothing.
+
+while ((v_pts_corr <= -mux_frametime && skip_flag > 0) || (v_pts_corr <= -2*mux_frametime)) {
+    v_pts_corr+=mux_frametime;
     --skip_flag; // dup
 }
-if( (v_pts_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag<0)
- || (v_pts_corr>=2*(float)mux_v->h.dwScale/mux_v->h.dwRate) )
-  if(skip_flag<=0){ // we can't skip more than 1 frame now
-    v_pts_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
+if ((v_pts_corr >= mux_frametime && skip_flag < 0) || (v_pts_corr >= 2*mux_frametime)) {
+  if (skip_flag<=0) { // we can't skip more than 1 frame now
+    v_pts_corr-=mux_frametime;
     ++skip_flag; // skip
   }
+}
 
 } // demuxer2