From 02220b88fc38ef9dd4f2d519f5d3e4151258b60c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 6 Feb 2022 14:49:23 +0100 Subject: avcodec/thread: Don't use ThreadFrame when unnecessary The majority of frame-threaded decoders (mainly the intra-only) need exactly one part of ThreadFrame: The AVFrame. They don't need the owners nor the progress, yet they had to use it because ff_thread_(get|release)_buffer() requires it. This commit changes this and makes these functions work with ordinary AVFrames; the decoders that need the extra fields for progress use ff_thread_(get|release)_ext_buffer() which work exactly as ff_thread_(get|release)_buffer() used to do. This also avoids some unnecessary allocations of progress AVBuffers, namely for H.264 and HEVC film grain frames: These frames are not used for synchronization and therefore don't need a ThreadFrame. Also move the ThreadFrame structure as well as ff_thread_ref_frame() to threadframe.h, the header for frame-threaded decoders with inter-frame dependencies. Reviewed-by: Anton Khirnov Signed-off-by: Andreas Rheinhardt --- libavcodec/v210dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavcodec/v210dec.c') diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index 0c95728781..19dd4eeeec 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -142,7 +142,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, V210DecContext *s = avctx->priv_data; ThreadData td; int ret, stride, aligned_input; - ThreadFrame frame = { .f = data }; AVFrame *pic = data; const uint8_t *psrc = avpkt->data; @@ -177,7 +176,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ff_v210dec_init(s); } - if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, pic, 0)) < 0) return ret; pic->pict_type = AV_PICTURE_TYPE_I; -- cgit v1.2.3