summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-05 10:35:00 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-05 10:35:00 +0000
commit0c5802cfa0bc53fffa3acd021904ac4fa9e43e6c (patch)
tree9821b8d1bcb0d5c9db739a18324c518ace84790e /libmpdemux
parent4cabae3691993b75de70f4d42f2e4e85d29de51d (diff)
downloadmpv-0c5802cfa0bc53fffa3acd021904ac4fa9e43e6c.tar.bz2
mpv-0c5802cfa0bc53fffa3acd021904ac4fa9e43e6c.tar.xz
10l - forgotten gettimeofday
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10811 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tvi_v4l2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index dcb6750b8f..4e85a86c64 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -1547,6 +1547,8 @@ static void *audio_grabber(void *data)
pthread_mutex_lock(&priv->skew_mutex);
if (priv->first_frame == 0) {
// there is no first frame yet (unlikely to happen)
+ gettimeofday(&tv, NULL);
+ priv->audio_start_time = (long long)1e6*tv.tv_sec + tv.tv_usec;
// fprintf(stderr, "warning - first frame not yet available!\n");
pthread_mutex_unlock(&priv->skew_mutex);
continue;
@@ -1593,7 +1595,6 @@ static void *audio_grabber(void *data)
// now finally, priv->audio_skew contains fairly good approximation
// of the current value
-// fprintf(stderr, "audio_skew = %lf, delta = %lf\n", (double)priv->audio_skew/1e6, (double)priv->audio_skew_delta_total/1e6);
// current skew factor (assuming linearity)
// used for further interpolation in video_grabber
// probably overkill but seems to be necessary for
@@ -1610,6 +1611,8 @@ static void *audio_grabber(void *data)
prev_skew = priv->audio_skew;
priv->audio_skew -= priv->audio_start_time - priv->first_frame;
pthread_mutex_unlock(&priv->skew_mutex);
+
+// fprintf(stderr, "audio_skew = %lf, delta = %lf\n", (double)priv->audio_skew/1e6, (double)priv->audio_skew_delta_total/1e6);
if ((priv->audio_tail+1) % priv->audio_buffer_size == priv->audio_head) {
mp_msg(MSGT_TV, MSGL_ERR, "\ntoo bad - dropping audio frame !\n");