Skip to content

F
ffmpeg.wasm-core
Commit 8f0db04b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 94b3a666
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
libavcodec/pthread.c
View file @ 8f0db04b
...@@ -959,11 +959,7 @@ int ff_thread_can_start_frame(AVCodecContext *avctx) ...@@ -959,11 +959,7 @@ int ff_thread_can_start_frame(AVCodecContext *avctx)
{ {
PerThreadContext *p = avctx->thread_opaque; PerThreadContext *p = avctx->thread_opaque;
if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP && if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && ( (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
#if FF_API_GET_BUFFER
avctx->get_buffer ||
#endif
avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
return 0; return 0;
} }
return 1; return 1;
...@@ -982,11 +978,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int ...@@ -982,11 +978,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
return ff_get_buffer(avctx, f->f, flags); return ff_get_buffer(avctx, f->f, flags);
if (p->state != STATE_SETTING_UP && if (p->state != STATE_SETTING_UP &&
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && ( (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
#if FF_API_GET_BUFFER
avctx->get_buffer ||
#endif
avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment