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/notchlc.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/notchlc.c')
| -rw-r--r-- | libavcodec/notchlc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/notchlc.c b/libavcodec/notchlc.c index be28161995..9dd3bf95a0 100644 --- a/libavcodec/notchlc.c +++ b/libavcodec/notchlc.c @@ -146,7 +146,7 @@ static int lz4_decompress(AVCodecContext *avctx, return bytestream2_tell_p(pb); } -static int decode_blocks(AVCodecContext *avctx, AVFrame *p, ThreadFrame *frame, +static int decode_blocks(AVCodecContext *avctx, AVFrame *p, unsigned uncompressed_size) { NotchLCContext *s = avctx->priv_data; @@ -221,7 +221,7 @@ static int decode_blocks(AVCodecContext *avctx, AVFrame *p, ThreadFrame *frame, return AVERROR_INVALIDDATA; s->uv_count_offset = s->y_data_offset - s->a_data_offset; - if ((ret = ff_thread_get_buffer(avctx, frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, p, 0)) < 0) return ret; rgb = *gb; @@ -464,7 +464,6 @@ static int decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { NotchLCContext *s = avctx->priv_data; - ThreadFrame frame = { .f = data }; GetByteContext *gb = &s->gb; PutByteContext *pb = &s->pb; unsigned uncompressed_size; @@ -513,7 +512,7 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_init(gb, s->uncompressed_buffer, uncompressed_size); } - ret = decode_blocks(avctx, p, &frame, uncompressed_size); + ret = decode_blocks(avctx, p, uncompressed_size); if (ret < 0) return ret; |