Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki 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>
pull/13/head
Hendrik Leppkes 12 years ago committed by Michael Niedermayer
parent 55bb8f4589
commit 97f8c6e147
1 changed files with 15 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      libavcodec/pthread.c

20
libavcodec/pthread.c
Unescape View File

@ -376,7 +376,11 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
if (fctx->die) break; 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); ff_thread_finish_setup(avctx);
avcodec_get_frame_defaults(&p->frame); avcodec_get_frame_defaults(&p->frame);
@ -933,8 +937,11 @@ 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 || (!avctx->thread_safe_callbacks && (
avctx->get_buffer != avcodec_default_get_buffer))) { #if FF_API_GET_BUFFER
avctx->get_buffer ||
#endif
avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
return 0; return 0;
} }
return 1; 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); 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 || (!avctx->thread_safe_callbacks && (
avctx->get_buffer != avcodec_default_get_buffer))) { #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;
} }

Write Preview
Loading…
Cancel
Save