videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-07 08:30:10 +02:00
Code Releases Activity

pthread: update all get_buffer checks for get_buffer2

Browse Source 
This restores the performance of simple frame-threaded codecs back to
their pre-merge levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Hendrik Leppkes 2013-03-17 10:59:39 +01:00 committed by Michael Niedermayer
parent 55bb8f4589
commit 97f8c6e147
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/pthread.c
View File

@ -376,7 +376,11 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
if (fctx->die) break;
if (!codec->update_thread_context && (avctx->thread_safe_callbacks || avctx->get_buffer == avcodec_default_get_buffer))
if (!codec->update_thread_context && (avctx->thread_safe_callbacks || (
#if FF_API_GET_BUFFER
!avctx->get_buffer &&
#endif
avctx->get_buffer2 == avcodec_default_get_buffer2)))
ff_thread_finish_setup(avctx);
avcodec_get_frame_defaults(&p->frame);
@ -933,8 +937,11 @@ int ff_thread_can_start_frame(AVCodecContext *avctx)
{
PerThreadContext *p = avctx->thread_opaque;
if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks &&
avctx->get_buffer != avcodec_default_get_buffer))) {
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && (
#if FF_API_GET_BUFFER
avctx->get_buffer ||
#endif
avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
return 0;
}
return 1;
@ -953,8 +960,11 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
return ff_get_buffer(avctx, f->f, flags);
if (p->state != STATE_SETTING_UP &&
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks &&
avctx->get_buffer != avcodec_default_get_buffer))) {
(avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && (
#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");
return -1;
}