[Mplayer-cvslog] CVS: main mencoder.c,1.118,1.119 cfg-mencoder.h,1.35,1.36

[Arpi of Ize]

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

Modified Files:
	mencoder.c cfg-mencoder.h 
Log Message:
-skiplimit/-noskip options to disable fps correction

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- mencoder.c	15 Apr 2002 00:36:21 -0000	1.118
+++ mencoder.c	15 Apr 2002 02:33:05 -0000	1.119
@@ -132,6 +132,7 @@
 
 float force_fps=0;
 float force_ofps=0; // set to 24 for inverse telecine
+static int skip_limit=-1;
 
 int force_srate=0;
 
@@ -862,11 +863,13 @@
 
 // check frame duplicate/drop:
 
-if(v_timer_corr>=(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;
     ++skip_flag; // skip
 } else
-while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate){
+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;
     --skip_flag; // dup
 }

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cfg-mencoder.h	15 Apr 2002 00:36:21 -0000	1.35
+++ cfg-mencoder.h	15 Apr 2002 02:33:05 -0000	1.36
@@ -81,6 +81,10 @@
 	{"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
 	{"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
 
+	{"skiplimit", &skip_limit, CONF_TYPE_INT, 0, 0, 0, NULL},
+	{"noskiplimit", &skip_limit, CONF_TYPE_FLAG, 0, 0, -1, NULL},
+	{"noskip", &skip_limit, CONF_TYPE_FLAG, 0, 0, 0, NULL},
+
 	{"x", &vo_w, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
 	{"y", &vo_h, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},