Mercurial > mplayer.hg

changeset 3285:bd7bff4cb453

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add tv fps support
author alex
date Mon, 03 Dec 2001 16:49:55 +0000
parents 702e399a4b3e
children 4f1f2697761a
files cfg-common.h libmpdemux/tv.c libmpdemux/tv.h
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Mon Dec 03 16:38:40 2001 +0000
+++ b/cfg-common.h	Mon Dec 03 16:49:55 2001 +0000
@@ -109,6 +109,7 @@
 	{"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096},
 	{"input", &tv_param_input, CONF_TYPE_INT, 0, 0, 20},
 	{"outfmt", &tv_param_outfmt, CONF_TYPE_STRING, 0, 0, 0},
+	{"fps", &tv_param_fps, CONF_TYPE_FLOAT, 0, 0, 100.0},
 	{NULL, NULL, 0, 0, 0, 0}
 };
 #endif
--- a/libmpdemux/tv.c	Mon Dec 03 16:38:40 2001 +0000
+++ b/libmpdemux/tv.c	Mon Dec 03 16:49:55 2001 +0000
@@ -44,7 +44,7 @@
 int tv_param_height = -1;
 int tv_param_input = 0; /* used in v4l and bttv */
 char *tv_param_outfmt = "yv12";
-
+float tv_param_fps = -1.0;
 
 /* ================== DEMUX_TV ===================== */
 /*
@@ -251,7 +251,9 @@
     {
 	if (funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FPS, &sh_video->fps) != TVI_CONTROL_TRUE)
 	    sh_video->fps = 25.0f; /* on PAL */
-    }
+    }    
+    if (tv_param_fps != -1.0f)
+	sh_video->fps = tv_param_fps;
     sh_video->frametime = 1.0f/sh_video->fps;
 
     /* set width */
--- a/libmpdemux/tv.h	Mon Dec 03 16:38:40 2001 +0000
+++ b/libmpdemux/tv.h	Mon Dec 03 16:49:55 2001 +0000
@@ -19,6 +19,7 @@
 extern int tv_param_height;
 extern int tv_param_input;
 extern char *tv_param_outfmt;
+extern float tv_param_fps;
 
 typedef struct tvi_info_s
 {