diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-06 14:49:23 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-09 17:22:35 +0100 |
| commit | 02220b88fc38ef9dd4f2d519f5d3e4151258b60c (patch) | |
| tree | 5ab09d5c019a822c0a839c6076bccff670986867 /libavcodec/cri.c | |
| parent | f025b8e110b36c1cdb4fb56c4cd57aeca1767b5b (diff) | |
| download | ffmpeg-02220b88fc38ef9dd4f2d519f5d3e4151258b60c.tar.gz | |
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 <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/cri.c')
| -rw-r--r-- | libavcodec/cri.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/cri.c b/libavcodec/cri.c index dfea24d979..3b2c955dd8 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -174,7 +174,6 @@ static int cri_decode_frame(AVCodecContext *avctx, void *data, { CRIContext *s = avctx->priv_data; GetByteContext *gb = &s->gb; - ThreadFrame frame = { .f = data }; int ret, bps, hflip = 0, vflip = 0; AVFrameSideData *rotation; int compressed = 0; @@ -318,7 +317,7 @@ skip: if (!s->data || !s->data_size) return AVERROR_INVALIDDATA; - if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, p, 0)) < 0) return ret; avctx->bits_per_raw_sample = bps; |