RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pthread_frame: use better memory orders for frame progress 

This improves commit 59c7022740.

In ff_thread_report_progress(), the fast code path can load
progress[field] with the relaxed memory order, and the slow code path
can store progress[field] with the release memory order. These changes
are mainly intended to avoid confusion when one inspects the source code.
They are unlikely to have measurable performance improvement.

ff_thread_report_progress() and ff_thread_await_progress() form a pair.
ff_thread_await_progress() reads progress[field] with the acquire memory
order (in the fast code path). Therefore, one expects to see
ff_thread_report_progress() write progress[field] with the matching
release memory order.

In the fast code path in ff_thread_report_progress(), the atomic load of
progress[field] doesn't need the acquire memory order because the
calling thread is trying to make the data it just decoded visible to the
other threads, rather than trying to read the data decoded by other
threads.

In ff_thread_get_buffer(), initialize progress[0] and progress[1] using
atomic_init().

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Wan-Teh Chang 2016-12-09 09:54:47 -08:00 committed by Anton Khirnov
parent e94b9313b2
commit 343e283399
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/pthread_frame.c
View File

@ -458,7 +458,7 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field)
atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL; atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL;
if (!progress || if (!progress ||
atomic_load_explicit(&progress[field], memory_order_acquire) >= n) atomic_load_explicit(&progress[field], memory_order_relaxed) >= n)
return; return;
p = f->owner->internal->thread_ctx; p = f->owner->internal->thread_ctx;
@ -468,7 +468,7 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field)
pthread_mutex_lock(&p->progress_mutex); pthread_mutex_lock(&p->progress_mutex);
atomic_store(&progress[field], n); atomic_store_explicit(&progress[field], n, memory_order_release);
pthread_cond_broadcast(&p->progress_cond); pthread_cond_broadcast(&p->progress_cond);
pthread_mutex_unlock(&p->progress_mutex); pthread_mutex_unlock(&p->progress_mutex);
@ -745,8 +745,8 @@ int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
} }
progress = (atomic_int*)f->progress->data; progress = (atomic_int*)f->progress->data;
atomic_store(&progress[0], -1); atomic_init(&progress[0], -1);
atomic_store(&progress[1], -1); atomic_init(&progress[1], -1);
} }
pthread_mutex_lock(&p->parent->buffer_mutex); pthread_mutex_lock(&p->parent->buffer_mutex);