highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
use THREAD_SAFE_CALLBACKS() to simplifx more code

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao
2018-08-11 17:15:39 +08:00
committed by Jun Zhao
parent 09e49a8fb0
commit 3ad0e6724d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pthread_frame.c
View File

@@ -908,8 +908,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
} }
pthread_mutex_lock(&p->parent->buffer_mutex); pthread_mutex_lock(&p->parent->buffer_mutex);
if (avctx->thread_safe_callbacks || if (THREAD_SAFE_CALLBACKS(avctx)) {
avctx->get_buffer2 == avcodec_default_get_buffer2) {
err = ff_get_buffer(avctx, f->f, flags); err = ff_get_buffer(avctx, f->f, flags);
} else { } else {
pthread_mutex_lock(&p->progress_mutex); pthread_mutex_lock(&p->progress_mutex);
@@ -976,8 +975,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
FrameThreadContext *fctx; FrameThreadContext *fctx;
AVFrame *dst, *tmp; AVFrame *dst, *tmp;
int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) || int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) ||
avctx->thread_safe_callbacks || THREAD_SAFE_CALLBACKS(avctx);
avctx->get_buffer2 == avcodec_default_get_buffer2;
if (!f->f || !f->f->buf[0]) if (!f->f || !f->f->buf[0])
return; return;