diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-14 13:04:30 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-14 13:04:30 +0000 |
| commit | 3740da878c422eb6e1c760af8c4a74654347f04a (patch) | |
| tree | 7d5cb75acf00ae59e9103897496471ebb6c5a79c /libmpdemux | |
| parent | 9af02c596ecbfb35b856912187b9e63776be834c (diff) | |
| download | mpv-3740da878c422eb6e1c760af8c4a74654347f04a.tar.bz2 mpv-3740da878c422eb6e1c760af8c4a74654347f04a.tar.xz | |
cleanups of the mutex usage
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15463 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index f84f9628f9..18639bc746 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -844,7 +844,7 @@ static int uninit(priv_t *priv) } /* stop audio thread */ - if (!tv_param_noaudio && !tv_param_immediate) { + if (!tv_param_noaudio) { pthread_join(priv->audio_grabber_thread, NULL); pthread_mutex_destroy(&priv->skew_mutex); pthread_mutex_destroy(&priv->audio_mutex); @@ -1432,9 +1432,9 @@ static void *video_grabber(void *data) /* store the timestamp of the very first frame as reference */ if (!priv->frames++) { - pthread_mutex_lock(&priv->skew_mutex); + if (!tv_param_noaudio) pthread_mutex_lock(&priv->skew_mutex); priv->first_frame = (long long)1e6*buf.timestamp.tv_sec + buf.timestamp.tv_usec; - pthread_mutex_unlock(&priv->skew_mutex); + if (!tv_param_noaudio) pthread_mutex_unlock(&priv->skew_mutex); } priv->curr_frame = (long long)buf.timestamp.tv_sec*1e6+buf.timestamp.tv_usec; // fprintf(stderr, "idx = %d, ts = %lf\n", buf.index, (double)(priv->curr_frame) / 1e6); @@ -1444,9 +1444,9 @@ static void *video_grabber(void *data) if (!priv->immediate_mode) { // interpolate the skew in time - pthread_mutex_lock(&priv->skew_mutex); + if (!tv_param_noaudio) pthread_mutex_lock(&priv->skew_mutex); xskew = priv->audio_skew + (interval - priv->audio_skew_measure_time)*priv->audio_skew_factor; - pthread_mutex_unlock(&priv->skew_mutex); + if (!tv_param_noaudio) pthread_mutex_unlock(&priv->skew_mutex); // correct extreme skew changes to avoid (especially) moving backwards in time if (xskew - prev_skew > delta*MAX_SKEW_DELTA) { skew = prev_skew + delta*MAX_SKEW_DELTA; |