har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frame_thread_encoder: extend critical code covered by finished_task_mutex.

Browse Source 
Should fix tsan errors in utvideoenc_rgb_left and related tests.
This commit is contained in:
Ronald S. Bultje 2017-05-25 08:20:21 -04:00
parent ca2209d67a
commit d98f34d7d4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/frame_thread_encoder.c
View File

@ -272,15 +272,16 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF
pthread_mutex_unlock(&c->task_fifo_mutex); pthread_mutex_unlock(&c->task_fifo_mutex);
c->task_index = (c->task_index+1) % BUFFER_SIZE; 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); 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) { while (!c->finished_tasks[c->finished_task_index].outdata) {
pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex); pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex);
} }