October 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/2] avformat/vividas: Check packet size
by Michael Niedermayer 03 Oct '23

03 Oct '23

Fixes: signed integer overflow: 119760682 - -2084600173 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-6745781167587328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/vividas.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index e9954f73ed0..e8efe49a5c0 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -683,6 +683,7 @@ static int viv_read_packet(AVFormatContext *s, if (viv->sb_entries[viv->current_sb_entry].flag == 0) { uint64_t v_size = ffio_read_varlen(pb); + int last, last_start; if (!viv->num_audio) return AVERROR_INVALIDDATA; @@ -704,14 +705,22 @@ static int viv_read_packet(AVFormatContext *s, start = ffio_read_varlen(pb); pcm_bytes = ffio_read_varlen(pb); - if (i > 0 && start == 0) - break; + if (i > 0) { + if (start == 0) + break; + if (start < last || start - (unsigned)last > INT_MAX) + return AVERROR_INVALIDDATA; + } viv->n_audio_subpackets = i + 1; + last = viv->audio_subpackets[i].start = start; viv->audio_subpackets[i].pcm_bytes = pcm_bytes; } + last_start = viv->audio_subpackets[viv->n_audio_subpackets].start = (int)(off - avio_tell(pb)); + if (last_start < last || last_start - (unsigned)last > INT_MAX) + return AVERROR_INVALIDDATA; viv->current_audio_subpacket = 0; } else { -- 2.17.1

2 7

[PATCH 1/4] avformat/mov: Avoid cloning encryption info if its unchanged
by Michael Niedermayer 22 Sep '23

22 Sep '23

Fixes: OOM Fixes: 45834/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5419540462305280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/mov.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3ec0ea2361..c93e13c8cd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6187,9 +6187,12 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt return AVERROR_INVALIDDATA; } - *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); - if (!*sample) - return AVERROR(ENOMEM); + if (sc->cenc.per_sample_iv_size || use_subsamples) { + *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); + if (!*sample) + return AVERROR(ENOMEM); + } else + *sample = NULL; if (sc->cenc.per_sample_iv_size != 0) { if ((ret = ffio_read_size(pb, (*sample)->iv, sc->cenc.per_sample_iv_size)) < 0) { @@ -7120,6 +7123,8 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa } else if (encrypted_index >= 0 && encrypted_index < encryption_index->nb_encrypted_samples) { // Per-sample setting override. encrypted_sample = encryption_index->encrypted_samples[encrypted_index]; + if (!encrypted_sample) + encrypted_sample = sc->cenc.default_encrypted_sample; } else { av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n"); return AVERROR_INVALIDDATA; -- 2.17.1

1 5

[PATCH 1/2] avcodec/cbs: Add specialization for ff_cbs_(read|write)_unsigned()
by Andreas Rheinhardt 30 Jul '23

30 Jul '23

These functions allow not only to read and write unsigned values, but also to check ranges and to emit trace output which can be beautified when processing arrays (indices like "[i]" are replaced by their actual numbers). Yet lots of callers actually only need something simpler: Their range is only implicitly restricted by the amount of bits used and they are not part of arrays, hence don't need this beautification. This commit adds specializations for these callers; this is very beneficial size-wise (it reduced the size of .text by 14928 bytes here), as a call is now cheaper. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/cbs.c | 34 ++++++++++++++++++++++++++++++---- libavcodec/cbs_av1.c | 28 +++++++++++++++++++--------- libavcodec/cbs_h2645.c | 15 +++++++++++++-- libavcodec/cbs_internal.h | 11 ++++++++++- libavcodec/cbs_mpeg2.c | 15 +++++++++++++-- libavcodec/cbs_vp9.c | 14 ++++++++++++-- 6 files changed, 97 insertions(+), 20 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index e829caa0a0..8bd63aa831 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -536,10 +536,13 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, position, name, pad, bits, value); } -int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, - int width, const char *name, - const int *subscripts, uint32_t *write_to, - uint32_t range_min, uint32_t range_max) +static av_always_inline int cbs_read_unsigned(CodedBitstreamContext *ctx, + GetBitContext *gbc, + int width, const char *name, + const int *subscripts, + uint32_t *write_to, + uint32_t range_min, + uint32_t range_max) { uint32_t value; int position; @@ -579,6 +582,22 @@ int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, return 0; } +int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, + const int *subscripts, uint32_t *write_to, + uint32_t range_min, uint32_t range_max) +{ + return cbs_read_unsigned(ctx, gbc, width, name, subscripts, + write_to, range_min, range_max); +} + +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, uint32_t *write_to) +{ + return cbs_read_unsigned(ctx, gbc, width, name, NULL, + write_to, 0, UINT32_MAX); +} + int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, int width, const char *name, const int *subscripts, uint32_t value, @@ -615,6 +634,13 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, return 0; } +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, + int width, const char *name, uint32_t value) +{ + return ff_cbs_write_unsigned(ctx, pbc, width, name, NULL, + value, 0, MAX_UINT_BITS(width)); +} + int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, int32_t *write_to, diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 1229480567..114d8580b3 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -412,9 +412,8 @@ static int cbs_av1_read_subexp(CodedBitstreamContext *ctx, GetBitContext *gbc, } if (len < max_len) { - err = ff_cbs_read_unsigned(ctx, gbc, range_bits, - "subexp_bits", NULL, &value, - 0, MAX_UINT_BITS(range_bits)); + err = ff_cbs_read_simple_unsigned(ctx, gbc, range_bits, + "subexp_bits", &value); if (err < 0) return err; @@ -476,10 +475,9 @@ static int cbs_av1_write_subexp(CodedBitstreamContext *ctx, PutBitContext *pbc, return err; if (len < max_len) { - err = ff_cbs_write_unsigned(ctx, pbc, range_bits, - "subexp_bits", NULL, - value - range_offset, - 0, MAX_UINT_BITS(range_bits)); + err = ff_cbs_write_simple_unsigned(ctx, pbc, range_bits, + "subexp_bits", + value - range_offset); if (err < 0) return err; @@ -546,8 +544,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define fb(width, name) \ - xf(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define fc(width, name, range_min, range_max) \ xf(width, name, current->name, range_min, range_max, 0, ) #define flag(name) fb(1, name) @@ -573,6 +569,13 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define READWRITE read #define RWContext GetBitContext +#define fb(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, \ + #name, &value)); \ + current->name = value; \ + } while (0) + #define xf(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -645,6 +648,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #undef READ #undef READWRITE #undef RWContext +#undef fb #undef xf #undef xsu #undef uvlc @@ -661,6 +665,11 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define READWRITE write #define RWContext PutBitContext +#define fb(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) + #define xf(width, name, var, range_min, range_max, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -723,6 +732,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #undef WRITE #undef READWRITE #undef RWContext +#undef fb #undef xf #undef xsu #undef uvlc diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 10b3bcc70b..54f6da186b 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -263,8 +263,6 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo #define u(width, name, range_min, range_max) \ xu(width, name, current->name, range_min, range_max, 0, ) -#define ub(width, name) \ - xu(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define flag(name) ub(1, name) #define ue(name, range_min, range_max) \ xue(name, current->name, range_min, range_max, 0, ) @@ -300,6 +298,12 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo #define READWRITE read #define RWContext GetBitContext +#define ub(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xu(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -374,6 +378,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #undef READ #undef READWRITE #undef RWContext +#undef ub #undef xu #undef xi #undef xue @@ -389,6 +394,11 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #define READWRITE write #define RWContext PutBitContext +#define ub(width, name) do { \ + uint32_t value = current->name; \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + value)); \ + } while (0) #define xu(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value = var; \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ @@ -452,6 +462,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #undef WRITE #undef READWRITE #undef RWContext +#undef ub #undef xu #undef xi #undef xue diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index f853086fa3..2838be6b9e 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -147,18 +147,27 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, // Helper functions for read/write of common bitstream elements, including -// generation of trace output. +// generation of trace output. The simple functions are equivalent to +// their non-simple counterparts except that their range is unrestricted +// (i.e. only limited by the amount of bits used) and they lack +// the ability to use subscripts. int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, uint32_t *write_to, uint32_t range_min, uint32_t range_max); +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, uint32_t *write_to); + int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, int width, const char *name, const int *subscripts, uint32_t value, uint32_t range_min, uint32_t range_max); +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, + int width, const char *name, uint32_t value); + int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, int32_t *write_to, diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 33bd3e0998..df58b50bab 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -40,8 +40,6 @@ #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define ui(width, name) \ - xui(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define uir(width, name) \ xui(width, name, current->name, 1, MAX_UINT_BITS(width), 0, ) #define uis(width, name, subs, ...) \ @@ -65,6 +63,12 @@ #define READWRITE read #define RWContext GetBitContext +#define ui(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, string, \ @@ -95,6 +99,7 @@ #undef READ #undef READWRITE #undef RWContext +#undef ui #undef xuia #undef xsi #undef nextbits @@ -105,6 +110,11 @@ #define READWRITE write #define RWContext PutBitContext +#define ui(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) + #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, string, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -134,6 +144,7 @@ #undef WRITE #undef READWRITE #undef RWContext +#undef ui #undef xuia #undef xsi #undef nextbits diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index ae7f88a8a3..def2ae0d21 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -251,8 +251,6 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define f(width, name) \ - xf(width, name, current->name, 0, ) #define s(width, name) \ xs(width, name, current->name, 0, ) #define fs(width, name, subs, ...) \ @@ -264,6 +262,12 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define READWRITE read #define RWContext GetBitContext +#define f(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xf(width, name, var, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -329,6 +333,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #undef READ #undef READWRITE #undef RWContext +#undef f #undef xf #undef xs #undef increment @@ -344,6 +349,10 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define READWRITE write #define RWContext PutBitContext +#define f(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) #define xf(width, name, var, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -396,6 +405,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #undef WRITE #undef READWRITE #undef RWContext +#undef f #undef xf #undef xs #undef increment -- 2.34.1

1 2

[PATCH] avcodec/h264_slice: Remove always-false check
by Andreas Rheinhardt 30 Jul '23

30 Jul '23

The H.264 decoder, the only codec with which this code is ever called, does not set AVCodec.pix_fmts. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/h264_slice.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6f0a7c1fb7..58fe245891 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -797,8 +797,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) CONFIG_H264_VIDEOTOOLBOX_HWACCEL + \ CONFIG_H264_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; - const enum AVPixelFormat *choices = pix_fmts; - int i; switch (h->ps.sps->bit_depth_luma) { case 9: @@ -883,9 +881,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #if CONFIG_H264_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; #endif - if (h->avctx->codec->pix_fmts) - choices = h->avctx->codec->pix_fmts; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) + if (h->avctx->color_range == AVCOL_RANGE_JPEG) *fmt++ = AV_PIX_FMT_YUVJ420P; else *fmt++ = AV_PIX_FMT_YUV420P; @@ -899,10 +895,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt = AV_PIX_FMT_NONE; - for (i=0; choices[i] != AV_PIX_FMT_NONE; i++) - if (choices[i] == h->avctx->pix_fmt && !force_callback) - return choices[i]; - return ff_thread_get_format(h->avctx, choices); + for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) + if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) + return pix_fmts[i]; + return ff_thread_get_format(h->avctx, pix_fmts); } /* export coded and cropped frame dimensions to AVCodecContext */ -- 2.34.1

1 1

[PATCH 1/3] closed caption decoder: accept and decode a new codec type of 'raw 608 byte pairs'
by Roger Pack 20 Jun '23

20 Jun '23

I needed this in order to be able to parse raw analog TV closed caption byte pairs (analog line 21 CC's).

6 12

[PATCH] fate: add adpcm_ima_cunning tests
by Zane van Iperen 27 May '23

27 May '23

single: Single-track track{0,1}: Dual-track trunc-t1: Truncated track 1 trunc-t2-track{0,1}: Fully-truncated track 2 trunc-t2a-track{0,1}: Partially-truncated track 2 trunc-h2: Truncated track 2 header Signed-off-by: Zane van Iperen <zane(a)zanevaniperen.com> --- tests/fate/adpcm.mak | 27 +++++++++++++++++++ tests/ref/fate/adpcm-ima-cunning-single | 1 + tests/ref/fate/adpcm-ima-cunning-track0 | 1 + tests/ref/fate/adpcm-ima-cunning-track1 | 1 + tests/ref/fate/adpcm-ima-cunning-trunc-h2 | 1 + tests/ref/fate/adpcm-ima-cunning-trunc-t1 | 1 + .../fate/adpcm-ima-cunning-trunc-t2-track0 | 1 + .../fate/adpcm-ima-cunning-trunc-t2-track1 | 1 + .../fate/adpcm-ima-cunning-trunc-t2a-track0 | 1 + .../fate/adpcm-ima-cunning-trunc-t2a-track1 | 1 + 10 files changed, 36 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-cunning-single create mode 100644 tests/ref/fate/adpcm-ima-cunning-track0 create mode 100644 tests/ref/fate/adpcm-ima-cunning-track1 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-h2 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-t1 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-t2-track0 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-t2-track1 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track0 create mode 100644 tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track1 diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 3e6d4ecdd1..bc2804477f 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -112,5 +112,32 @@ fate-adpcm-ima-alp-mono: CMD = md5 -i $(TARGET_SAMPLES)/alp/AD_P11.PCM -f s16le FATE_ADPCM-$(call DEMDEC, ALP, ADPCM_IMA_ALP) += fate-adpcm-ima-alp-stereo fate-adpcm-ima-alp-stereo: CMD = md5 -i $(TARGET_SAMPLES)/alp/theme-cut.tun -f s16le +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-single +fate-adpcm-ima-cunning-single: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/GD-cut.5c -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-track0 +fate-adpcm-ima-cunning-track0: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-cut.11c -map 0:a:0 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-track1 +fate-adpcm-ima-cunning-track1: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-cut.11c -map 0:a:1 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-t1 +fate-adpcm-ima-cunning-trunc-t1: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-t1.11c -map 0:a:0 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-t2-track0 +fate-adpcm-ima-cunning-trunc-t2-track0: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-t2.11c -map 0:a:0 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-t2-track1 +fate-adpcm-ima-cunning-trunc-t2-track1: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-t2.11c -map 0:a:1 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-t2a-track0 +fate-adpcm-ima-cunning-trunc-t2a-track0: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-t2a.11c -map 0:a:0 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-t2a-track1 +fate-adpcm-ima-cunning-trunc-t2a-track1: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-t2a.11c -map 0:a:1 -f s16le + +FATE_ADPCM-$(call DEMDEC, PP_BNK, ADPCM_IMA_CUNNING) += fate-adpcm-ima-cunning-trunc-h2 +fate-adpcm-ima-cunning-trunc-h2: CMD = md5 -y -i $(TARGET_SAMPLES)/pp_bnk/VIDEOMOD-trunc-h2.11c -map 0:a:0 -f s16le + FATE_SAMPLES_AVCONV += $(FATE_ADPCM-yes) fate-adpcm: $(FATE_ADPCM-yes) diff --git a/tests/ref/fate/adpcm-ima-cunning-single b/tests/ref/fate/adpcm-ima-cunning-single new file mode 100644 index 0000000000..49a8308093 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-single @@ -0,0 +1 @@ +dd6ba6151c3e74d09be3c54005465aab diff --git a/tests/ref/fate/adpcm-ima-cunning-track0 b/tests/ref/fate/adpcm-ima-cunning-track0 new file mode 100644 index 0000000000..bd489cfb45 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-track0 @@ -0,0 +1 @@ +fb8db1eef33860c1adde4932e7a250ac diff --git a/tests/ref/fate/adpcm-ima-cunning-track1 b/tests/ref/fate/adpcm-ima-cunning-track1 new file mode 100644 index 0000000000..f79013c9de --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-track1 @@ -0,0 +1 @@ +4b2f9c416ae676526754c82f2a669c91 diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-h2 b/tests/ref/fate/adpcm-ima-cunning-trunc-h2 new file mode 100644 index 0000000000..bd489cfb45 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-h2 @@ -0,0 +1 @@ +fb8db1eef33860c1adde4932e7a250ac diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-t1 b/tests/ref/fate/adpcm-ima-cunning-trunc-t1 new file mode 100644 index 0000000000..4669e38855 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-t1 @@ -0,0 +1 @@ +a0eaad31febdcf1cfb94a4d418e1e140 diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track0 b/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track0 new file mode 100644 index 0000000000..bd489cfb45 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track0 @@ -0,0 +1 @@ +fb8db1eef33860c1adde4932e7a250ac diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track1 b/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track1 new file mode 100644 index 0000000000..df9edc403d --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-t2-track1 @@ -0,0 +1 @@ +d41d8cd98f00b204e9800998ecf8427e diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track0 b/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track0 new file mode 100644 index 0000000000..bd489cfb45 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track0 @@ -0,0 +1 @@ +fb8db1eef33860c1adde4932e7a250ac diff --git a/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track1 b/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track1 new file mode 100644 index 0000000000..77d4b09e62 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-cunning-trunc-t2a-track1 @@ -0,0 +1 @@ +af0d42f01108333ab356061f9cab9403 -- 2.25.1

3 5

[PATCH 1/3 v4] avutil/frame: add av_frame_replace
by James Almer 18 May '23

18 May '23

Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavutil/frame.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 13 +++++ 2 files changed, 137 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index de4ad1f94d..864c66371f 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -471,6 +471,130 @@ fail: return ret; } +int av_frame_replace(AVFrame *dst, const AVFrame *src) +{ + int ret = 0; + + if (dst == src) + return AVERROR(EINVAL); + + if (!src->buf[0]) { + av_frame_unref(dst); + + /* duplicate the frame data if it's not refcounted */ + if ( src->data[0] || src->data[1] + || src->data[2] || src->data[3]) + return av_frame_ref(dst, src); + return 0; + } + + dst->format = src->format; + dst->width = src->width; + dst->height = src->height; + dst->nb_samples = src->nb_samples; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + dst->channels = src->channels; + dst->channel_layout = src->channel_layout; + if (!av_channel_layout_check(&src->ch_layout)) { + av_channel_layout_uninit(&dst->ch_layout); + if (src->channel_layout) + av_channel_layout_from_mask(&dst->ch_layout, src->channel_layout); + else { + dst->ch_layout.nb_channels = src->channels; + dst->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + } + } else { +#endif + ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); + if (ret < 0) + goto fail; +#if FF_API_OLD_CHANNEL_LAYOUT + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + wipe_side_data(dst); + av_dict_free(&dst->metadata); + ret = frame_copy_props(dst, src, 0); + if (ret < 0) + goto fail; + + /* replace the buffers */ + for (int i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) { + ret = av_buffer_replace(&dst->buf[i], src->buf[i]); + if (ret < 0) + goto fail; + } + + if (src->extended_buf) { + if (dst->nb_extended_buf != src->nb_extended_buf) { + int nb_extended_buf = FFMIN(dst->nb_extended_buf, src->nb_extended_buf); + void *tmp; + + for (int i = nb_extended_buf; i < dst->nb_extended_buf; i++) + av_buffer_unref(&dst->extended_buf[i]); + + tmp = av_realloc_array(dst->extended_buf, sizeof(*dst->extended_buf), + src->nb_extended_buf); + if (!tmp) { + ret = AVERROR(ENOMEM); + goto fail; + } + dst->extended_buf = tmp; + dst->nb_extended_buf = src->nb_extended_buf; + + memset(&dst->extended_buf[nb_extended_buf], 0, + (src->nb_extended_buf - nb_extended_buf) * sizeof(*dst->extended_buf)); + } + + for (int i = 0; i < src->nb_extended_buf; i++) { + ret = av_buffer_replace(&dst->extended_buf[i], src->extended_buf[i]); + if (ret < 0) + goto fail; + } + } else if (dst->extended_buf) { + for (int i = 0; i < dst->nb_extended_buf; i++) + av_buffer_unref(&dst->extended_buf[i]); + av_freep(&dst->extended_buf); + } + + ret = av_buffer_replace(&dst->hw_frames_ctx, src->hw_frames_ctx); + if (ret < 0) + goto fail; + + if (dst->extended_data != dst->data) + av_freep(&dst->extended_data); + + if (src->extended_data != src->data) { + int ch = dst->ch_layout.nb_channels; + + if (!ch) { + ret = AVERROR(EINVAL); + goto fail; + } + + if (ch > SIZE_MAX / sizeof(*dst->extended_data)) + goto fail; + + dst->extended_data = av_memdup(src->extended_data, sizeof(*dst->extended_data) * ch); + if (!dst->extended_data) { + ret = AVERROR(ENOMEM); + goto fail; + } + } else + dst->extended_data = dst->data; + + memcpy(dst->data, src->data, sizeof(src->data)); + memcpy(dst->linesize, src->linesize, sizeof(src->linesize)); + + return 0; + +fail: + av_frame_unref(dst); + return ret; +} + AVFrame *av_frame_clone(const AVFrame *src) { AVFrame *ret = av_frame_alloc(); diff --git a/libavutil/frame.h b/libavutil/frame.h index 6d9563bc5d..859ccf6c6c 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -762,6 +762,19 @@ void av_frame_free(AVFrame **frame); */ int av_frame_ref(AVFrame *dst, const AVFrame *src); +/** + * Ensure the destination frame refers to the same data described by the source + * frame by creating a new reference for each AVBufferRef from src if they + * differ from those in dst, or if src is not reference counted, by allocating + * new buffers and copying data. + * + * Frame properties on dst will be replaced by those from src. + * + * @return 0 on success, a negative AVERROR on error. On error, dst is + * unreferenced. + */ +int av_frame_replace(AVFrame *dst, const AVFrame *src); + /** * Create a new frame that references the same data as src. * -- 2.37.1

2 5

[PATCH 1/2] avfilter/src_movie: switch to activate()
by Paul B Mahol 12 May '23

12 May '23

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavfilter/src_movie.c | 90 +++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 34 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 711854c23c..bc7b0d37af 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -46,6 +46,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" @@ -55,6 +56,7 @@ typedef struct MovieStream { AVCodecContext *codec_ctx; int64_t discontinuity_threshold; int64_t last_pts; + int got_eof; } MovieStream; typedef struct MovieContext { @@ -70,6 +72,8 @@ typedef struct MovieContext { int64_t discontinuity_threshold; int64_t ts_offset; int dec_threads; + int got_eagain; + int got_wanted; AVFormatContext *format_ctx; @@ -100,7 +104,6 @@ static const AVOption movie_options[]= { }; static int movie_config_output_props(AVFilterLink *outlink); -static int movie_request_frame(AVFilterLink *outlink); static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) { @@ -314,7 +317,6 @@ static av_cold int movie_common_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); pad.config_props = movie_config_output_props; - pad.request_frame = movie_request_frame; if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; if ( movie->st[i].st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && @@ -554,47 +556,67 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) return 0; } -static int movie_request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - AVFilterContext *ctx = outlink->src; MovieContext *movie = ctx->priv; - unsigned out_id = FF_OUTLINK_IDX(outlink); + int ret = 0; + + /* check all decoders for available output */ + for (int i = 0; i < ctx->nb_outputs; i++) { + if (movie->st[i].got_eof) + continue; + + if (ff_outlink_frame_wanted(ctx->outputs[i])) + movie->got_wanted++; - while (1) { - int got_eagain = 0, got_eof = 0; - int ret = 0; + ret = movie_push_frame(ctx, i); + if (ret == AVERROR(EAGAIN)) + movie->got_eagain++; + else if (ret == AVERROR_EOF) + movie->st[i].got_eof = 1; + else if (ret < 0) + return ret; + } + + if (movie->got_eagain || movie->got_wanted) { + /* all decoders require more input -> read a new packet */ + movie->got_eagain = 0; + movie->got_wanted = 0; + ret = movie_decode_packet(ctx); + if (ret < 0 && ret != AVERROR(EAGAIN)) + return ret; + ff_filter_set_ready(ctx, 100); + return 0; + } else { + int nb_eofs = 0; - /* check all decoders for available output */ for (int i = 0; i < ctx->nb_outputs; i++) { - ret = movie_push_frame(ctx, i); - if (ret == AVERROR(EAGAIN)) - got_eagain++; - else if (ret == AVERROR_EOF) - got_eof++; - else if (ret < 0) - return ret; - else if (i == out_id) - return 0; + if (movie->st[i].got_eof) { + if (movie->loop_count == 1) + ff_outlink_set_status(ctx->outputs[i], AVERROR_EOF, movie->st[i].last_pts); + nb_eofs++; + } + } + + if (nb_eofs != ctx->nb_outputs) { + ff_filter_set_ready(ctx, 100); + return 0; } - if (got_eagain) { - /* all decoders require more input -> read a new packet */ - ret = movie_decode_packet(ctx); + if (movie->loop_count != 1) { + ret = rewind_file(ctx); if (ret < 0) return ret; - } else if (got_eof) { - /* all decoders flushed */ - if (movie->loop_count != 1) { - ret = rewind_file(ctx); - if (ret < 0) - return ret; - movie->loop_count -= movie->loop_count > 1; - av_log(ctx, AV_LOG_VERBOSE, "Stream finished, looping.\n"); - continue; - } - return AVERROR_EOF; + movie->loop_count -= movie->loop_count > 1; + av_log(ctx, AV_LOG_VERBOSE, "Stream finished, looping.\n"); + for (int i = 0; i < ctx->nb_outputs; i++) + movie->st[i].got_eof = 0; + ff_filter_set_ready(ctx, 100); } + return 0; } + + return FFERROR_NOT_READY; } static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, @@ -651,7 +673,7 @@ const AVFilter ff_avsrc_movie = { .init = movie_common_init, .uninit = movie_uninit, FILTER_QUERY_FUNC(movie_query_formats), - + .activate = activate, .inputs = NULL, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, @@ -670,7 +692,7 @@ const AVFilter ff_avsrc_amovie = { .init = movie_common_init, .uninit = movie_uninit, FILTER_QUERY_FUNC(movie_query_formats), - + .activate = activate, .inputs = NULL, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, -- 2.35.1

2 6

[PATCH] Added support for MB_INFO
by Carotti, Elias 05 May '23

05 May '23

Hi, patch attached to add support for passing down to libx264 information about which macroblock could be eligible for being coded as P_SKIP. NICE SRL, viale Monte Grappa 3/5, 20124 Milano, Italia, Registro delle Imprese di Milano Monza Brianza Lodi REA n. 2096882, Capitale Sociale: 10.329,14 EUR i.v., Cod. Fisc. e P.IVA 01133050052, Societa con Socio Unico

5 16

[PATCH] lavu: header and documentation for AVWriter
by Nicolas George 28 Apr '23

28 Apr '23

The actual implementation, tests and uses in the rest of FFmpeg code will be committed separately once the API is settled. Signed-off-by: Nicolas George <george(a)nsup.org> --- doc/avwriter_intro.md | 109 ++++++++++ libavutil/writer.h | 484 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 593 insertions(+) create mode 100644 doc/avwriter_intro.md create mode 100644 libavutil/writer.h As suggested by JB, here is the header and documentation for AVWriter, to discuss the principle before investing time in polishing the implementation. I expect to discuss the API and if no blockign objections are raised push it then spend time on the implementation. This API is a nicer and much more powerful version of BPrint. It can be used to simplify existing code where BPrint could help, plus places where BPrint could not help. It also is the prerequisite for more ambitious projects, expecially universal serialization of FFmpeg objects (side data and such) into standardized formats. The implementation is in most part done, and I am sure I can deliver. What remains is the boring part of integrating the tests in FATE, polishing various parts, updating the parts where I changed my mind midway, etc. Note: FF_NEW_SZ is a macro defined elsewhere; it is really part of the implementation more than the API. diff --git a/doc/avwriter_intro.md b/doc/avwriter_intro.md new file mode 100644 index 0000000000..4fd8a5a4ad --- /dev/null +++ b/doc/avwriter_intro.md @@ -0,0 +1,109 @@ +# Quick start guide for AVWriter + +AVWriter is an API to unify functions returning strings (or any arbitrary +binary buffer) and to make building strings from parts easier. Here is a +quick introduction with pairs of “what I would do without AVWriter” / +“how to do it with AVWriter” of example code. + +## I want a `char*` buffer, the function wants an AVWriter + +Old-style code: + +``` + char *buf; + ret = av_something_to_string(&buf, something); + if (ret < 0) + die("Failed"); + use_string(buf); + av_freep(&buf); +``` + +Equivalent code with AVWriter: + +``` + AVWriter wr = av_dynbuf_writer(); + av_something_write(wr, something, 0); + if (av_writer_get_error(wr, 0) < 0) + die("Failed"); + use_string(av_dynbuf_writer_get_data(wr, NULL)); + av_dynbuf_writer_finalize(wr, NULL, NULL); +``` + +If the string is small enough, no dynamic memory allocation happens. + +The NULL to `av_dynbuf_writer_get_data()` can be used to retrieve the size +of the data in the buffer. + +Calling `av_writer_get_error()` is mandatory. + +## I want a *persistent* `char*` buffer, the function wants an AVWriter + +Old-style code: + +``` + char *buf; + ret = av_something_to_string(&buf, something); + if (ret < 0) + die("Failed"); + ctx->string = buf; +``` + +Equivalent code with AVWriter: + +``` + AVWriter wr = av_dynbuf_writer(); + av_something_write(wr, something, 0); + ret = av_dynbuf_writer_finalize(wr, &ctx->string, NULL); + if (ret < 0) + die("Failed"); +``` + +## I have a `char[]` buffer, the function wants an AVWriter + +Old-style code: + +``` + char buf[BUF_SIZE]; + av_something_to_string(buf, sizeof(buf), something); + use_string(buf); +``` + +Equivalent code with AVWriter: + +``` + char buf[BUF_SIZE]; + av_something_write(av_buf_writer(buf, sizeof(buf)), something, 0); + use_string(buf); +``` + +## I need to build a string from parts + +Old-style code: + +``` + char buf[1024]; + int pos = 0; + pos += snprintf(buf + pos, sizeof(buf) - pos, + "Stream %d: ", i); + av_get_channel_layout_string(buf + pos, sizeof(buf) - pos, + nb, layout); + pos += strlen(buf + pos); + pos += snprintf(buf + pos, sizeof(buf) - pos, + ", %s", av_get_sample_fmt_name(fmt)); +``` + +Note: this code could overflow the buffer. + +Equivalent code with AVWriter: + +``` + AVWriter wr = av_dynbuf_writer(); + av_writer_printf(wr, "Stream %d: ", i); + av_channel_layout_write(wr, nb, layout, 0); + av_writer_printf(wr, ", %s", av_get_sample_fmt_name(fmt)); +``` + +See the first example on how to access the resulting string. + +Note: this is very similar to using AVBPrint; from this side, AVWriter +replaces AVBPrint. diff --git a/libavutil/writer.h b/libavutil/writer.h new file mode 100644 index 0000000000..55e2cf3ea6 --- /dev/null +++ b/libavutil/writer.h @@ -0,0 +1,484 @@ +/* + * Copyright (c) 2022 The FFmpeg project + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_WRITER_H +#define AVUTIL_WRITER_H + +#include <stdio.h> +#include <stddef.h> +#include <stdarg.h> + +#include "extendable.h" +#include "bprint.h" + +/** + * @defgroup av_writer AVWriter + * + * Object-oriented API to write strings and binary data. + * + * @{ + */ + +typedef struct AVWriterMethods AVWriterMethods; + +/** + * Opaque object to write strings and binary data. + * + * AVWriter is meant to allow to build and return strings (and blocks of + * binary data) efficiently between functions. + * For example, a function that serialize something into a string will + * actually write into an AVWriter, and the caller will choose the way the + * data will be stored or processed on the fly. + * + * For a quick introduction on how to use AVWriter in simple cases, see + * doc/avwriter_intro.md. + * + * There are various pre-defined types of AVWriter, see below: + * + * - av_dynbuf_writer() writes the data into a buffer that is grown with + * av_realloc() if it does not fit in the initial buffer; it is the + * recommended choice. + * + * - av_buf_writer() writes the data into a pre-existing finite buffer. + * + * - av_stdio_writer() writes the data into a FILE*. + * + * - av_log_writer() writes the data to av_log(). + * + * AVWriter objects are passed by value. It allows creating a writer on the + * fly, without extra variable or error checking. The structure can never + * change. + */ +typedef struct AVWriter { + const AVWriterMethods *methods; + void *obj; +} AVWriter; + +/** + * Write a data buffer to an AVWriter. + */ +void av_writer_write(AVWriter wr, const char *buf, size_t size); + +/** + * Write a 0-terminated string to an AVWriter. + */ +void av_writer_print(AVWriter wr, const char *str); + +/** + * Write a formatted string to an AVWriter. + * Note: do not use libc-specific extensions to the format string. + */ +void av_writer_printf(AVWriter wr, const char *fmt, ...); + +/** + * Write a formatted to string an AVWriter using a va_list. + */ +void av_writer_vprintf(AVWriter wr, const char *fmt, va_list va); + +/** + * Write a sequence of identical chars to an AVWriter. + */ +void av_writer_add_chars(AVWriter wr, char c, size_t n); + +/** + * Flush data that may be buffered in the writer. + */ +void av_writer_flush(AVWriter wr); + +/** + * Return the error status of the writer, an AVERROR code. + * + * If self_only is non-zero, return errors only on this writer and not on + * possible other writers that it got from the caller. If in doubt, use 0. + */ +int av_writer_get_error(AVWriter wr, int self_only); + +/** + * Print a sane value for invalid input. + * + * This is a flag for all av_something_write() functions: when presented + * with an invalid "something", if the flag is not present they should leave + * the writer unchanged; if the flag is present they should print a sane + * fallback string. + */ +#define AV_WRITER_FALLBACK 0x10000 + +/***************************************************************************/ + +/** + * @defgroup av_dynbuf_writer AVDynbufWriter + * + * An implementation of AVWriter that writes to a dynamic buffer. + * + * The buffer is kept 0-terminated. + * + * The buffer is initially kept in the variable itself, it switches to heap + * allocation if it grows too large. In that case, av_writer_get_error() can + * return AVERROR(ENOMEM) if the allocation fails. + * + * @{ + */ + +/** + * An AVWriter object for pre-allocated memory buffers. + * + * Can be allocated on the stack. + * + * Should be inited with one of the utility functions. + */ +typedef struct AVDynbufWriter { + size_t self_size; /**< Size of the structure itself */ + unsigned flags; + AVBPrint bp; +} AVDynbufWriter; + +const AVWriterMethods *av_dynbuf_writer_get_methods(void); +int av_dynbuf_writer_check(AVWriter wr); + +/** + * Initialize an AVDynbufWriter. + * + * @return dwr itself + * dwr->self_size must be set. + */ +AVDynbufWriter *av_dynbuf_writer_init(AVDynbufWriter *dwr); + +/** + * Create an AVWriter from an AVDynbufWriter structure. + */ +AVWriter av_dynbuf_writer_wrap(AVDynbufWriter *dwr); + +/** + * Create an AVWriter to a dynamic buffer. + * + * Note: as it relies on a compound statement, the AVDynbufWriter object has + * a scope limited to the block where this macro is called. + */ +#define av_dynbuf_writer() \ + av_dynbuf_writer_wrap(av_dynbuf_writer_init(&FF_NEW_SZ(AVDynbufWriter))) + +/** + * Get a pointer to the buffer data of an AVWriter to a dynamic buffer. + * + * If not null, size will be set to the size of the data in the buffer. + * + * Undefined behavior if called with another type of AVWriter. + * Undefined behavior if called without checking for error first. + */ +char *av_dynbuf_writer_get_data(AVWriter wr, size_t *size); + +/** + * Get a pointer to the buffer data of an AVWriter to a dynamic buffer + * (unsafe version). + * + * If not null, size will be set to the size of the data in the buffer. + * + * If the writer is in error, the data may be truncated. + * + * Undefined behavior if called with another type of AVWriter. + */ +char *av_dynbuf_writer_get_data_unsafe(AVWriter wr, size_t *size); + +/** + * Finalize an AVWriter to a dynamic buffer. + * + * @arg[out] buf if not NULL, used to return the buffer contents + * @arg[out] size if not NULL, used to return the size of the data + * @return 0 for success or error code (probably AVERROR(ENOMEM)) + * + * In case of error, the buffer will not be duplicated but still freed. + * Same if the writer is already in error. + * + * Undefined behavior if called with another type of AVWriter. + */ +int av_dynbuf_writer_finalize(AVWriter wr, char **buf, size_t *size); + +/** + * Finalize an AVWriter to a dynamic buffer (unsafe version). + * + * @arg[out] buf if not NULL, used to return the buffer contents + * @arg[out] size if not NULL, used to return the size of the data + * @return 0 for success or error code (probably AVERROR(ENOMEM)) + * + * If the writer is in error, the returned data may be truncated. + * + * In case of error, the buffer will not be duplicated but still freed. + * + * Undefined behavior if called with another type of AVWriter. + */ +int av_dynbuf_writer_finalize_unsafe(AVWriter wr, char **buf, size_t *size); + +/** + * Allocate chars in the buffer for external use. + * + * Undefined behavior if called with another type of AVWriter. + */ +char *av_dynbuf_writer_get_buffer(AVWriter wr, size_t size, size_t *rsize); + +/** + * Advance the position in the buffer. + * + * size must be <= *rsize on a previous call to + * av_dynbuf_writer_get_buffer(). + * + * Undefined behavior if called with another type of AVWriter. + * Undefined behavior is called not directly after + * av_dynbuf_writer_get_buffer(). + */ +void av_dynbuf_writer_advance_buffer(AVWriter wr, size_t size); + +/** + * @} + */ + +/***************************************************************************/ + +/** + * @defgroup av_buf_writer AVBufWriter + * + * An implementtion of AVWriter that writes into an already-allocated buffer + * of memory. + * + * The buffer is kept 0-terminated. If the buffer is too small, the data is + * discarded, but the total size is computed. + * + * @{ + */ + +/** + * An AVWriter object for pre-allocated memory buffers. + * + * Can be allocated on the stack. + * + * Should be inited with one of the utility functions. + */ +typedef struct AVBufWriter { + size_t self_size; /**< Size of the structure itself */ + char *buf; /**< Memory buffer. Must not be NULL nor empty. */ + size_t size; /**< Size of the memory buffer. Must not be 0. */ + size_t pos; /**< Position in the memory buffer. */ +} AVBufWriter; + +const AVWriterMethods *av_buf_writer_get_methods(void); +int av_buf_writer_check(AVWriter wr); + +/** + * Initialize an AVBufWriter to an already-allocated memory buffer. + * + * @return bwr itself + * bwr->self_size must be set. + */ +AVBufWriter *av_buf_writer_init(AVBufWriter *bwr, char *buf, size_t size); + +/** + * Create an AVWriter from an AVBufWriter structure. + */ +AVWriter av_buf_writer_wrap(AVBufWriter *bwr); + +/** + * Create an AVWriter to a buffer. + * + * Note: as it relies on a compound statement, the AVBufWriter object has + * a scope limited to the block where this macro is called. + */ +#define av_buf_writer(buf, size) \ + av_buf_writer_wrap(av_buf_writer_init(&FF_NEW_SZ(AVBufWriter), (buf), (size))) + +/** + * Create an AVWriter to a char[] or equivalent. + * + * Note: as it relies on a compound statement, the AVBufWriter object has + * a scope limited to the block where this macro is called. + */ +#define av_buf_writer_array(array) \ + av_buf_writer(array, sizeof (array)) + +/** + * @} + */ + +/***************************************************************************/ + +/** + * @defgroup av_stdio_writer AVStdioWriter + * + * An implementation of AVWriter that writes to stdio. + * + * @{ + */ + +const AVWriterMethods *av_stdio_writer_get_methods(void); +int av_stdio_writer_check(AVWriter wr); + +/** + * Create an AVWriter that goes to a stdio FILE. + */ +AVWriter av_stdio_writer(FILE *out); + +/** + * @} + */ + +/***************************************************************************/ + +/** + * @defgroup av_log_writer AVLogWriter + * + * An implementation of AVWriter that writes to av_log(). + * + * @{ + */ + +const AVWriterMethods *av_log_writer_get_methods(void); +int av_log_writer_check(AVWriter wr); + +/** + * Create an AVWriter that goes to av_log(obj). + */ +AVWriter av_log_writer(void *obj); + +/** + * Log to a writer. + * If wr does not go to av_log(), level is ignored. + */ +void av_log_writer_log(AVWriter wr, int level, const char *fmt, ...); + +/** + * @} + */ + +/***************************************************************************/ + +/** + * @defgroup av_writer_methods AVWriterMethods + * + * Structures and utility needed to define new types of AVWriter. + * + * @{ + */ + +/** + * Set of methods for implementing an AVWriter. + * + * Applications that want to implement other kinds of AVWriter + * need to create a structure with some of these methods implemented. + * + * Every type of AVWriter is supposed to have a pair of functions: + * av_something_writer_get_methods() returns the methods for that type. + * av_something_writer_checks() returns 1 if the writer is of that type. + * + * A macro to define the structure and functions is provided below. + * + * When a type of AVWriter defines specific functions, it is usually the + * responsibility of the caller to ensure that they are called only with a + * compatible AVWriter; otherwise the behavior is undefined. + */ +struct AVWriterMethods { + + /** + * Size of the structure itself. + * Must normally be set to sizeof(AVWriterMethods). + */ + size_t self_size; + + /** + * Name of the object type. + */ + const char *name; + + /** + * Warn that an operation was impossible even with fallbacks. + */ + void (*impossible)(AVWriter wr, const char *message); + + /** + * Notify that size chars have been discarded + */ + void (*notify_discard)(AVWriter wr, size_t size); + + /** + * Get the error status of the writer + * If self_only is non-zero, return errors only on this writer and not on + * possible other writers that it got from the caller. Errors from + * writers created internally should always be checked. + */ + int (*get_error)(AVWriter wr, int self_only); + + /** + * Write chars directly. + */ + void (*write)(AVWriter wr, const char *buf, size_t size); + + /** + * Write a formatted string. + */ + void (*vprintf)(AVWriter wr, const char *fmt, va_list ap); + + /** + * Get a buffer to write data. + * If *size is returned < min_size, data may get discarded. + * A writer that implements this method must implement advance_buffer too. + * If vprintf is not implemented, av_write_printf() will use + * get_buffer() and vsnprintf(): it will need an extra char in the + * buffer for the 0 that vsnprintf() adds. + */ + char *(*get_buffer)(AVWriter wr, size_t min_size, size_t *size); + + /** + * Acknowledge chars written in a buffer obtained with get_buffer(). + * size is guaranteed <= the size value returned by get_buffer(). + */ + void (*advance_buffer)(AVWriter wr, size_t size); + + /** + * Flush immediately data that may be buffered in the writer. + */ + void (*flush)(AVWriter wr); + +}; + +/** + * Convenience macro for the boilerplate necessary to define a writer class. + * + * @arg qual type qualifier for for the symbols, for example "static" + * @arg type class name for the type of writer, + * for example "AVBufWriter" or "MyWriter" + * @arg prefix prefix for the symbols, + * for example "av_buf_writer" or "my_writer" + */ +#define AV_WRITER_DEFINE_METHODS(qual, type, prefix) \ +static const AVWriterMethods prefix##_methods; \ +qual const AVWriterMethods *prefix##_get_methods(void) { \ + return &prefix##_methods; \ +} \ +qual int prefix##_check(AVWriter wr) { \ + return wr.methods == prefix##_get_methods(); \ +} \ +static const AVWriterMethods prefix##_methods = + +/** + * @} + */ + +/** + * @} + */ + +#endif /* AVUTIL_WRITER_H */ -- 2.35.1

9 23