Mercurial > mplayer.hg

changeset 32668:cb671a73f3a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use getfps helper function everywhere, simplifies code and avoids a possible division by 0.
author reimar
date Wed, 05 Jan 2011 15:11:16 +0000
parents e47b15813eba
children 956db4f28a62
files stream/tvi_v4l2.c
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/stream/tvi_v4l2.c	Wed Jan 05 14:55:45 2011 +0000
+++ b/stream/tvi_v4l2.c	Wed Jan 05 15:11:16 2011 +0000
@@ -731,12 +731,7 @@
         priv->immediate_mode = 1;
         return TVI_CONTROL_TRUE;
     case TVI_CONTROL_VID_GET_FPS:
-        if (!priv->standard.frameperiod.denominator || !priv->standard.frameperiod.numerator) {
-            mp_msg(MSGT_TV, MSGL_ERR, "%s: Cannot get fps\n", info.short_name);
-            return TVI_CONTROL_FALSE;
-        }
-        *(float *)arg = (float)priv->standard.frameperiod.denominator /
-            priv->standard.frameperiod.numerator;
+        *(float *)arg = getfps(priv);
         mp_msg(MSGT_TV, MSGL_V, "%s: get fps: %f\n", info.short_name,
                *(float *)arg);
         return TVI_CONTROL_TRUE;
@@ -1463,9 +1458,7 @@
 
     /* setup video parameters */
     if (!priv->tv_param->noaudio) {
-        if (priv->video_buffer_size_max < (3*priv->standard.frameperiod.denominator) /
-                                               priv->standard.frameperiod.numerator
-            *priv->audio_secs_per_block) {
+        if (priv->video_buffer_size_max < 3*getfps(priv)*priv->audio_secs_per_block) {
             mp_msg(MSGT_TV, MSGL_ERR, "Video buffer shorter than 3 times audio frame duration.\n"
                    "You will probably experience heavy framedrops.\n");
         }