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

[Ronald S. Bultje]

Should fix tsan errors in utvideoenc_rgb_left and related tests.
---
 libavcodec/frame_thread_encoder.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavcodec/frame_thread_encoder.c 
b/libavcodec/frame_thread_encoder.c
index 27ae356..2746964 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -273,14 +273,21 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, 
AVPacket *pkt, const AVF
 
         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)
+        pthread_mutex_lock(&c->finished_task_mutex);
+        if(!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;
+        }
+    } else {
+        pthread_mutex_lock(&c->finished_task_mutex);
     }
 
-    if(c->task_index == c->finished_task_index)
+    if(c->task_index == c->finished_task_index) {
+        pthread_mutex_unlock(&c->finished_task_mutex);
         return 0;
+    }
 
-    pthread_mutex_lock(&c->finished_task_mutex);
     while (!c->finished_tasks[c->finished_task_index].outdata) {
         pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex);
     }
-- 
2.8.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel