From aa9c2e41b6467136836e1b4d19ee39c7fe0b838e Mon Sep 17 00:00:00 2001 From: Aaron Colwell Date: Thu, 22 Mar 2012 12:37:47 -0700 Subject: [PATCH] pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Reimar Döffinger Signed-off-by: Michael Niedermayer --- libavcodec/pthread.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index ccf84efdbe7..c23098fbf54 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -365,21 +365,17 @@ static attribute_align_arg void *frame_worker_thread(void *arg) AVCodecContext *avctx = p->avctx; AVCodec *codec = avctx->codec; + pthread_mutex_lock(&p->mutex); while (1) { int i; - if (p->state == STATE_INPUT_READY && !fctx->die) { - pthread_mutex_lock(&p->mutex); while (p->state == STATE_INPUT_READY && !fctx->die) pthread_cond_wait(&p->input_cond, &p->mutex); - pthread_mutex_unlock(&p->mutex); - } if (fctx->die) break; if (!codec->update_thread_context && (avctx->thread_safe_callbacks || avctx->get_buffer == avcodec_default_get_buffer)) ff_thread_finish_setup(avctx); - pthread_mutex_lock(&p->mutex); avcodec_get_frame_defaults(&p->frame); p->got_frame = 0; p->result = codec->decode(avctx, &p->frame, &p->got_frame, &p->avpkt); @@ -397,9 +393,8 @@ static attribute_align_arg void *frame_worker_thread(void *arg) pthread_cond_broadcast(&p->progress_cond); pthread_cond_signal(&p->output_cond); pthread_mutex_unlock(&p->progress_mutex); - - pthread_mutex_unlock(&p->mutex); } + pthread_mutex_unlock(&p->mutex); return NULL; } -- 2.39.2