[FFmpeg-devel] [PATCH] frame_thread_encoder: extend critical code covered by finished_task_mutex.

[Michael Niedermayer]

On Thu, May 25, 2017 at 08:20:46AM -0400, Ronald S. Bultje wrote:
> Should fix tsan errors in utvideoenc_rgb_left and related tests.
> ---
>  libavcodec/frame_thread_encoder.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
> index 27ae356..6cf1a68 100644
> --- a/libavcodec/frame_thread_encoder.c
> +++ b/libavcodec/frame_thread_encoder.c
> @@ -272,15 +272,16 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF
>          pthread_mutex_unlock(&c->task_fifo_mutex);
>  
>          c->task_index = (c->task_index+1) % BUFFER_SIZE;
> -
> -        if(!c->finished_tasks[c->finished_task_index].outdata && (c->task_index - c->finished_task_index) % BUFFER_SIZE <= avctx->thread_count)
> -            return 0;
>      }
>  
> -    if(c->task_index == c->finished_task_index)
> -        return 0;
> -
>      pthread_mutex_lock(&c->finished_task_mutex);
> +    if (c->task_index == c->finished_task_index ||
> +        (frame && !c->finished_tasks[c->finished_task_index].outdata &&
> +         (c->task_index - c->finished_task_index) % BUFFER_SIZE <= avctx->thread_count)) {
> +            pthread_mutex_unlock(&c->finished_task_mutex);
> +            return 0;
> +        }
> +
>      while (!c->finished_tasks[c->finished_task_index].outdata) {
>          pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex);
>      }

LGTM

thx

[...]

--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170525/e656058c/attachment.sig>