Mercurial > mplayer.hg

changeset 11997:48b5bfb25dc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
missing video thread shutdown, frame count rounding fix
author henry
date Wed, 25 Feb 2004 11:52:40 +0000
parents 398c24cecdc7
children 92e50387211a
files libmpdemux/tvi_v4l2.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/tvi_v4l2.c	Tue Feb 24 21:09:21 2004 +0000
+++ b/libmpdemux/tvi_v4l2.c	Wed Feb 25 11:52:40 2004 +0000
@@ -785,13 +785,16 @@
     int i, frames, dropped = 0;
 
     priv->shutdown = 1;
+    pthread_join(priv->video_grabber_thread, NULL);
     pthread_mutex_destroy(&priv->video_buffer_mutex);
 
     if (priv->streamon) {
 	struct v4l2_buffer buf;
 
 	/* get performance */
-	frames = 1 + (priv->curr_frame - priv->first_frame) *
+	frames = 1 + (priv->curr_frame - priv->first_frame +
+		      priv->standard.frameperiod.numerator * 500000 /
+		      priv->standard.frameperiod.denominator) *
 	    priv->standard.frameperiod.denominator /
 	    priv->standard.frameperiod.numerator / 1000000;
 	dropped = frames - priv->frames;