diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-06-04 12:01:51 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-06-11 10:08:58 -0300 |
| commit | 569a9d3d70324cf77391820155846a5b9d429ad5 (patch) | |
| tree | 105f28629ba3b2a62ae510d36f15353296f1ad2d /libavcodec | |
| parent | 52dc21a68df37f5aa36b334de4d10747780bff9d (diff) | |
| download | ffmpeg-569a9d3d70324cf77391820155846a5b9d429ad5.tar.gz | |
pthread_frame: change the way delay is set
It is a constant known at codec init, so set it in
ff_frame_thread_init(). Also, only set it for video, since the meaning
of this field is not well-defined for audio with frame threading.
Fixes availability of delay in callbacks invoked from the per-thread
contexts after 1f4cf92cfbd3accbae582ac63126ed5570ddfd37.
(cherry picked from commit 6943ab688d0c75dbab3222b5b80457ab72a0615f)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread_frame.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 64121f5a9a..601f170447 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -310,7 +310,6 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, } if (for_user) { - dst->delay = src->thread_count - 1; #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS dst->coded_frame = src->coded_frame; @@ -790,6 +789,9 @@ int ff_frame_thread_init(AVCodecContext *avctx) fctx->async_lock = 1; fctx->delaying = 1; + if (codec->type == AVMEDIA_TYPE_VIDEO) + avctx->delay = src->thread_count - 1; + for (i = 0; i < thread_count; i++) { AVCodecContext *copy = av_malloc(sizeof(AVCodecContext)); PerThreadContext *p = &fctx->threads[i]; @@ -827,6 +829,8 @@ int ff_frame_thread_init(AVCodecContext *avctx) copy->internal->thread_ctx = p; copy->internal->last_pkt_props = &p->avpkt; + copy->delay = avctx->delay; + if (codec->priv_data_size) { copy->priv_data = av_mallocz(codec->priv_data_size); if (!copy->priv_data) { |