May 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/packet: remove reference to old AV_SIDE_DATA_PARAM_CHANGE_ values
by James Almer 31 May '24

31 May '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 29 20:49:44 2024 -0300| [8a1c491354bca7fde10220a66840d458faf96476] | committer: James Almer avcodec/packet: remove reference to old AV_SIDE_DATA_PARAM_CHANGE_ values They were forgotten in 65ddc74988245a01421a63c5cffa4d900c47117c. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a1c491354bca7fde… --- libavcodec/packet.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/packet.h b/libavcodec/packet.h index a9a41576da..f05deb7950 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -59,10 +59,6 @@ enum AVPacketSideDataType { * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows: * @code * u32le param_flags - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) - * s32le channel_count - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) - * u64le channel_layout * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) * s32le sample_rate * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)

1 0

avcodec/diracdec: Mark flush as av_cold
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue May 28 14:08:34 2024 +0200| [8cbf7e8408465134f2cc5d8cdd1e41ab038ebb40] | committer: Andreas Rheinhardt avcodec/diracdec: Mark flush as av_cold Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8cbf7e8408465134f… --- libavcodec/diracdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 5bf0dcc2db..76209aebba 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -351,7 +351,7 @@ static int alloc_buffers(DiracContext *s, int stride) return 0; } -static void free_sequence_buffers(DiracContext *s) +static av_cold void free_sequence_buffers(DiracContext *s) { int i, j, k; @@ -413,7 +413,7 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx) return 0; } -static void dirac_decode_flush(AVCodecContext *avctx) +static av_cold void dirac_decode_flush(AVCodecContext *avctx) { DiracContext *s = avctx->priv_data; free_sequence_buffers(s);

1 0

avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue May 28 13:11:08 2024 +0200| [0f3090cbd12558909055c4a701aacc86f66747bc] | committer: Andreas Rheinhardt avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP This was one of the few decoders incompatible with the flag. Also only call free_sequence_buffers() instead of dirac_decode_flush() in dirac_decode_end(). Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f3090cbd12558909… --- libavcodec/diracdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 3a36479c59..5bf0dcc2db 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -403,11 +403,8 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx) for (i = 0; i < MAX_FRAMES; i++) { s->all_frames[i].avframe = av_frame_alloc(); - if (!s->all_frames[i].avframe) { - while (i > 0) - av_frame_free(&s->all_frames[--i].avframe); + if (!s->all_frames[i].avframe) return AVERROR(ENOMEM); - } } ret = ff_thread_once(&dirac_arith_init, ff_dirac_init_arith_tables); if (ret != 0) @@ -429,7 +426,9 @@ static av_cold int dirac_decode_end(AVCodecContext *avctx) DiracContext *s = avctx->priv_data; int i; - dirac_decode_flush(avctx); + // Necessary in case dirac_decode_init() failed + if (s->all_frames[MAX_FRAMES - 1].avframe) + free_sequence_buffers(s); for (i = 0; i < MAX_FRAMES; i++) av_frame_free(&s->all_frames[i].avframe); @@ -2371,4 +2370,5 @@ const FFCodec ff_dirac_decoder = { FF_CODEC_DECODE_CB(dirac_decode_frame), .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1, .flush = dirac_decode_flush, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };

1 0

avcodec/vc2enc: Use already available AVPixFmtDescriptor
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue May 28 03:55:45 2024 +0200| [d9bd5baf9d298a220f34eead54ba56c2d1bd33ba] | committer: Andreas Rheinhardt avcodec/vc2enc: Use already available AVPixFmtDescriptor Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9bd5baf9d298a220… --- libavcodec/vc2enc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index e2ff27ddb8..4ea836d9c9 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1026,9 +1026,9 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) { Plane *p; SubBand *b; - int i, level, o, shift, ret; - const AVPixFmtDescriptor *fmt = av_pix_fmt_desc_get(avctx->pix_fmt); - const int depth = fmt->comp[0].depth; + int i, level, o, shift; + const AVPixFmtDescriptor *pixdesc; + int depth; VC2EncContext *s = avctx->priv_data; s->picture_number = 0; @@ -1100,12 +1100,13 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) s->base_vf, base_video_fmts[s->base_vf].name); } + pixdesc = av_pix_fmt_desc_get(avctx->pix_fmt); /* Chroma subsampling */ - ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - if (ret) - return ret; + s->chroma_x_shift = pixdesc->log2_chroma_w; + s->chroma_y_shift = pixdesc->log2_chroma_h; /* Bit depth and color range index */ + depth = pixdesc->comp[0].depth; if (depth == 8 && avctx->color_range == AVCOL_RANGE_JPEG) { s->bpp = 1; s->bpp_idx = 1;

1 0

avcodec/vc2enc: Move transient PutBitContext from ctx to stack
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue May 28 03:41:59 2024 +0200| [d1d40a7c9b59b3a94451c4180b66de48686e8899] | committer: Andreas Rheinhardt avcodec/vc2enc: Move transient PutBitContext from ctx to stack Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1d40a7c9b59b3a94… --- libavcodec/vc2enc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index cad7390055..e2ff27ddb8 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -105,9 +105,11 @@ typedef struct Plane { } Plane; typedef struct SliceArgs { - PutBitContext pb; - int cache[DIRAC_MAX_QUANT_INDEX]; const struct VC2EncContext *ctx; + union { + int cache[DIRAC_MAX_QUANT_INDEX]; + uint8_t *buf; + }; int x; int y; int quant_idx; @@ -724,9 +726,9 @@ static int calc_slice_sizes(VC2EncContext *s) /* VC-2 13.5.3 - hq_slice */ static int encode_hq_slice(AVCodecContext *avctx, void *arg) { - SliceArgs *slice_dat = arg; + const SliceArgs *slice_dat = arg; const VC2EncContext *s = slice_dat->ctx; - PutBitContext *pb = &slice_dat->pb; + PutBitContext pb0, *const pb = &pb0; const int slice_x = slice_dat->x; const int slice_y = slice_dat->y; const int quant_idx = slice_dat->quant_idx; @@ -735,8 +737,9 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg) int p, level, orientation; /* The reference decoder ignores it, and its typical length is 0 */ - memset(put_bits_ptr(pb), 0, s->prefix_bytes); - skip_put_bytes(pb, s->prefix_bytes); + memset(slice_dat->buf, 0, s->prefix_bytes); + + init_put_bits(pb, slice_dat->buf + s->prefix_bytes, slice_dat->bytes - s->prefix_bytes); put_bits(pb, 8, quant_idx); @@ -789,7 +792,7 @@ static int encode_slices(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - init_put_bits(&args->pb, buf + skip, args->bytes); + args->buf = buf + skip; skip += args->bytes; } }

1 0

avcodec/vc2enc: Avoid relocations for short strings
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 27 17:15:09 2024 +0200| [c30928566623110354e4cb3a10f28183cee01684] | committer: Andreas Rheinhardt avcodec/vc2enc: Avoid relocations for short strings These strings are so short that they can be put directly into the containing structure, avoiding the pointer and putting it into .rodata. Also use chars for interlaced and level while at it, as these are so small. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3092856662311035… --- libavcodec/vc2enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 3285218724..cad7390055 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -41,8 +41,9 @@ typedef struct VC2BaseVideoFormat { enum AVPixelFormat pix_fmt; AVRational time_base; - int width, height, interlaced, level; - const char *name; + int width, height; + uint8_t interlaced, level; + char name[13]; } VC2BaseVideoFormat; static const VC2BaseVideoFormat base_video_fmts[] = {

1 0

avcodec/vc2enc: Fix slice length
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat May 25 20:32:42 2024 +0200| [02ecf8d7f3fe6ad6bc493a37bfff65bfe9150113] | committer: Andreas Rheinhardt avcodec/vc2enc: Fix slice length args->bytes here already includes prefix_bytes (see SSIZE_ROUND macro), so including it here again and forgetting it when offsetting skip seems wrong. This only works because prefix_bytes is currently always zero in this encoder. (This has been added in b88be742fac7a77a8095e8155ba8790db4b77568 without any reason.) Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02ecf8d7f3fe6ad6b… --- libavcodec/vc2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index f39f368181..3285218724 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -788,7 +788,7 @@ static int encode_slices(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - init_put_bits(&args->pb, buf + skip, args->bytes+s->prefix_bytes); + init_put_bits(&args->pb, buf + skip, args->bytes); skip += args->bytes; } }

1 0

avcodec/vc2enc: Remove superfluous error message
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat May 25 20:23:52 2024 +0200| [eac8dcb1871c4e16c7288d7f447067a4d41b345e] | committer: Andreas Rheinhardt avcodec/vc2enc: Remove superfluous error message ff_get_encode_buffer() already emits an error message of its own. While just at it, also check for ret < 0 instead of just ret != 0. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eac8dcb1871c4e16c… --- libavcodec/vc2enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 4dcf423ef1..f39f368181 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -918,10 +918,8 @@ static int encode_frame(VC2EncContext *s, AVPacket *avpkt, const AVFrame *frame, if (field < 2) { ret = ff_get_encode_buffer(s->avctx, avpkt, max_frame_bytes << s->interlaced, 0); - if (ret) { - av_log(s->avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + if (ret < 0) return ret; - } init_put_bits(&s->pb, avpkt->data, avpkt->size); }

1 0

avcodec/vc2enc: Constify slices->main context pointers
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat May 25 20:18:12 2024 +0200| [b1702afdfdfa111cca0c69c48c43e108a397eeb0] | committer: Andreas Rheinhardt avcodec/vc2enc: Constify slices->main context pointers Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1702afdfdfa111cc… --- libavcodec/vc2enc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index b496f67d3a..4dcf423ef1 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -106,7 +106,7 @@ typedef struct Plane { typedef struct SliceArgs { PutBitContext pb; int cache[DIRAC_MAX_QUANT_INDEX]; - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; int x; int y; int quant_idx; @@ -116,7 +116,7 @@ typedef struct SliceArgs { } SliceArgs; typedef struct TransformArgs { - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; Plane *plane; const void *idata; ptrdiff_t istride; @@ -527,8 +527,8 @@ static void encode_picture_start(VC2EncContext *s) #define QUANT(c, mul, add, shift) (((mul) * (c) + (add)) >> (shift)) /* VC-2 13.5.5.2 - slice_band() */ -static void encode_subband(VC2EncContext *s, PutBitContext *pb, int sx, int sy, - SubBand *b, int quant) +static void encode_subband(const VC2EncContext *s, PutBitContext *pb, + int sx, int sy, const SubBand *b, int quant) { int x, y; @@ -558,7 +558,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) int x, y; uint8_t quants[MAX_DWT_LEVELS][4]; int bits = 0, p, level, orientation; - VC2EncContext *s = slice->ctx; + const VC2EncContext *s = slice->ctx; if (slice->cache[quant_idx]) return slice->cache[quant_idx]; @@ -576,7 +576,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) bits += 8; for (level = 0; level < s->wavelet_depth; level++) { for (orientation = !!level; orientation < 4; orientation++) { - SubBand *b = &s->plane[p].band[level][orientation]; + const SubBand *b = &s->plane[p].band[level][orientation]; const int q_idx = quants[level][orientation]; const uint64_t q_m = ((uint64_t)s->qmagic_lut[q_idx][0]) << 2; @@ -618,7 +618,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) static int rate_control(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; const int top = slice_dat->bits_ceil; const int bottom = slice_dat->bits_floor; int quant_buf[2] = {-1, -1}; @@ -724,7 +724,7 @@ static int calc_slice_sizes(VC2EncContext *s) static int encode_hq_slice(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; PutBitContext *pb = &slice_dat->pb; const int slice_x = slice_dat->x; const int slice_y = slice_dat->y; @@ -839,7 +839,7 @@ static int encode_slices(VC2EncContext *s) static int dwt_plane(AVCodecContext *avctx, void *arg) { TransformArgs *transform_dat = arg; - VC2EncContext *s = transform_dat->ctx; + const VC2EncContext *s = transform_dat->ctx; const void *frame_data = transform_dat->idata; const ptrdiff_t linesize = transform_dat->istride; const int field = transform_dat->field;

1 0

avcodec/vc2enc: Avoid void* where possible
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat May 25 20:17:24 2024 +0200| [6d86146fce70cba380d652691f9653957b879069] | committer: Andreas Rheinhardt avcodec/vc2enc: Avoid void* where possible Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d86146fce70cba38… --- libavcodec/vc2enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 365d43146d..b496f67d3a 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -106,7 +106,7 @@ typedef struct Plane { typedef struct SliceArgs { PutBitContext pb; int cache[DIRAC_MAX_QUANT_INDEX]; - void *ctx; + struct VC2EncContext *ctx; int x; int y; int quant_idx; @@ -116,7 +116,7 @@ typedef struct SliceArgs { } SliceArgs; typedef struct TransformArgs { - void *ctx; + struct VC2EncContext *ctx; Plane *plane; const void *idata; ptrdiff_t istride;

1 0