diff options
| author | rcombs <rcombs@rcombs.me> | 2021-12-18 04:55:44 -0600 |
|---|---|---|
| committer | rcombs <rcombs@rcombs.me> | 2021-12-22 18:38:40 -0600 |
| commit | 9a890e49b66d611c1c97347c9529ae85920bd5a1 (patch) | |
| tree | 01b8d837d8520127256171cd1dcb647ffbb96ff8 | |
| parent | 0e7684e55481197caa067c2b01d376b14a0ec251 (diff) | |
| download | ffmpeg-9a890e49b66d611c1c97347c9529ae85920bd5a1.tar.gz | |
lavc/proresdec: fix threaded hwaccel decode
| -rw-r--r-- | libavcodec/proresdec2.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 719194f21e..d2d881a3dd 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -807,6 +807,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; + ff_thread_finish_setup(avctx); if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, NULL, 0); @@ -856,6 +857,18 @@ static av_cold int decode_close(AVCodecContext *avctx) return 0; } +#if HAVE_THREADS +static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) +{ + ProresContext *csrc = src->priv_data; + ProresContext *cdst = dst->priv_data; + + cdst->pix_fmt = csrc->pix_fmt; + + return 0; +} +#endif + const AVCodec ff_prores_decoder = { .name = "prores", .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), @@ -865,6 +878,7 @@ const AVCodec ff_prores_decoder = { .init = decode_init, .close = decode_close, .decode = decode_frame, + .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, |