September 2023 - ffmpeg-cvslog

avcodec/rka: improve VRQ mode decoding
by Paul B Mahol 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Sep 30 15:01:38 2023 +0200| [ead1426a683523d2973add000b2391f258ab25c6] | committer: Paul B Mahol avcodec/rka: improve VRQ mode decoding > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ead1426a683523d29… --- libavcodec/rka.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libavcodec/rka.c b/libavcodec/rka.c index 62ad68dc4d..724107f3e2 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -165,8 +165,12 @@ static av_cold int rka_decode_init(AVCodecContext *avctx) qfactor = -qfactor; s->ch[0].qfactor = s->ch[1].qfactor = qfactor < 0 ? 2 : qfactor; - s->ch[0].vrq = qfactor < 0 ? FFABS(qfactor) : 0; - s->ch[1].vrq = qfactor < 0 ? FFABS(qfactor) : 0; + s->ch[0].vrq = qfactor < 0 ? -qfactor : 0; + s->ch[1].vrq = qfactor < 0 ? -qfactor : 0; + if (qfactor < 0) { + s->ch[0].vrq = av_clip(s->ch[0].vrq, 1, 8); + s->ch[1].vrq = av_clip(s->ch[1].vrq, 1, 8); + } av_log(avctx, AV_LOG_DEBUG, "qfactor: %d\n", qfactor); return 0; @@ -665,16 +669,14 @@ static int mdl64_decode(ACoder *ac, Model64 *ctx, int *dst) return 0; } -static const uint8_t tab[16] = { - 0, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 -}; +static const uint8_t vrq_qfactors[8] = { 3, 3, 2, 2, 1, 1, 1, 1 }; static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, unsigned size) { FiltCoeffs filt; Model64 *mdl64; - int m = 0, split, val, last_val = 0, ret; - unsigned idx = 3, bits = 0; + int split, val, last_val = 0, ret; + unsigned rsize, idx = 3, bits = 0, m = 0; if (ctx->qfactor == 0) { if (amdl_decode_int(&ctx->fshift, ac, &bits, 15) < 0) @@ -698,10 +700,12 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns if (amdl_decode_int(&ctx->position, ac, &idx, 10) < 0) return -1; + m = 0; idx = (ctx->pos_idx + idx) % 11; ctx->pos_idx = idx; - for (int y = 0; y < FFMIN(split, size - x); y++, off++) { + rsize = FFMIN(split, size - x); + for (int y = 0; y < rsize; y++, off++) { int midx, shift = idx, *src, sum = 16; if (off >= FF_ARRAY_ELEMS(ctx->buf0)) @@ -750,10 +754,10 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns } if (ctx->vrq != 0) { int sum = 0; - for (int i = (signed)((unsigned)m << 6) / split; i > 0; i = i >> 1) + for (unsigned i = (m << 6) / rsize; i > 0; i = i >> 1) sum++; - sum = sum - (ctx->vrq + 7); - ctx->qfactor = FFMAX(sum, tab[ctx->vrq]); + sum -= (ctx->vrq + 7); + ctx->qfactor = FFMAX(sum, vrq_qfactors[ctx->vrq - 1]); } x += split;

1 0

avcodec/rka: rename variable to something more representative
by Paul B Mahol 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Sep 30 13:22:32 2023 +0200| [8bfadacfd110d202829c5ecbe557a3cf02b44eb0] | committer: Paul B Mahol avcodec/rka: rename variable to something more representative > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bfadacfd110d2028… --- libavcodec/rka.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/rka.c b/libavcodec/rka.c index 92c1237d1f..62ad68dc4d 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -59,8 +59,8 @@ typedef struct AdaptiveModel { } AdaptiveModel; typedef struct ChContext { - int cmode; - int cmode2; + int qfactor; + int vrq; int last_nb_decoded; unsigned srate_pad; unsigned pos_idx; @@ -131,7 +131,7 @@ static void adaptive_model_free(AdaptiveModel *am) static av_cold int rka_decode_init(AVCodecContext *avctx) { RKAContext *s = avctx->priv_data; - int cmode; + int qfactor; if (avctx->extradata_size < 16) return AVERROR_INVALIDDATA; @@ -160,14 +160,14 @@ static av_cold int rka_decode_init(AVCodecContext *avctx) s->last_nb_samples = s->total_nb_samples % s->frame_samples; s->correlated = avctx->extradata[15] & 1; - cmode = avctx->extradata[14] & 0xf; + qfactor = avctx->extradata[14] & 0xf; if ((avctx->extradata[15] & 4) != 0) - cmode = -cmode; + qfactor = -qfactor; - s->ch[0].cmode = s->ch[1].cmode = cmode < 0 ? 2 : cmode; - s->ch[0].cmode2 = cmode < 0 ? FFABS(cmode) : 0; - s->ch[1].cmode2 = cmode < 0 ? FFABS(cmode) : 0; - av_log(avctx, AV_LOG_DEBUG, "cmode: %d\n", cmode); + s->ch[0].qfactor = s->ch[1].qfactor = qfactor < 0 ? 2 : qfactor; + s->ch[0].vrq = qfactor < 0 ? FFABS(qfactor) : 0; + s->ch[1].vrq = qfactor < 0 ? FFABS(qfactor) : 0; + av_log(avctx, AV_LOG_DEBUG, "qfactor: %d\n", qfactor); return 0; } @@ -676,7 +676,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns int m = 0, split, val, last_val = 0, ret; unsigned idx = 3, bits = 0; - if (ctx->cmode == 0) { + if (ctx->qfactor == 0) { if (amdl_decode_int(&ctx->fshift, ac, &bits, 15) < 0) return -1; bits &= 31U; @@ -728,7 +728,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns for (int i = 15; i < filt.size; i++) sum += filt.coeffs[i] * (unsigned)src[-i]; sum = sum >> 6; - if (ctx->cmode == 0) { + if (ctx->qfactor == 0) { if (bits == 0) { ctx->buf1[off] = sum + val; } else { @@ -737,7 +737,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns } ctx->buf0[off] = ctx->buf1[off] + (unsigned)ctx->buf0[off + -1]; } else { - val *= 1U << ctx->cmode; + val *= 1U << ctx->qfactor; sum += ctx->buf0[off + -1] + (unsigned)val; switch (s->bps) { case 16: sum = av_clip_int16(sum); break; @@ -748,12 +748,12 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns m += (unsigned)FFABS(ctx->buf1[off]); } } - if (ctx->cmode2 != 0) { + if (ctx->vrq != 0) { int sum = 0; for (int i = (signed)((unsigned)m << 6) / split; i > 0; i = i >> 1) sum++; - sum = sum - (ctx->cmode2 + 7); - ctx->cmode = FFMAX(sum, tab[ctx->cmode2]); + sum = sum - (ctx->vrq + 7); + ctx->qfactor = FFMAX(sum, tab[ctx->vrq]); } x += split;

1 0

avdevice/lavfi: Fix double-free on error
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Sep 29 19:25:39 2023 +0200| [2cb2465cc739aa34f33b70426b0f6c8183cdfa79] | committer: Andreas Rheinhardt avdevice/lavfi: Fix double-free on error After the AVFrame has been wrapped into a buffer, it is owned by the buffer and must not be freed manually any more. Yet this happens on subsequent errors. This bug was introduced in 6ca43a9675d651d7ea47c7ba2fafb1bf831c4d0b. Reviewed-by: Timo Rothenpieler <timo(a)rothenpieler.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cb2465cc739aa34f… --- libavdevice/lavfi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index ec7ebdbc90..2bfd0b81c7 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -365,7 +365,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) LavfiContext *lavfi = avctx->priv_data; double min_pts = DBL_MAX; int stream_idx, min_pts_sink_idx = 0; - AVFrame *frame; + AVFrame *frame, *frame_to_free; AVDictionary *frame_metadata; int ret, i; AVStream *st; @@ -378,6 +378,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) frame = av_frame_alloc(); if (!frame) return AVERROR(ENOMEM); + frame_to_free = frame; /* iterate through all the graph sinks. Select the sink with the * minimum PTS */ @@ -423,6 +424,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) ret = AVERROR(ENOMEM); goto fail; } + frame_to_free = NULL; pkt->data = pkt->buf->data; pkt->size = pkt->buf->size; @@ -463,12 +465,11 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) - av_frame_free(&frame); + av_frame_free(&frame_to_free); return pkt->size; fail: - av_frame_free(&frame); + av_frame_free(&frame_to_free); return ret; }

1 0

avformat/mov: Check avif_info
by Michael Niedermayer 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Sep 21 20:09:12 2023 +0200| [9a3bbf89bd9b32b9849d34920f7afcbd861d4e6b] | committer: Michael Niedermayer avformat/mov: Check avif_info Fixes: leak Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6674082962997248 Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6674082962997248 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a3bbf89bd9b32b98… --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 1996e0028c..294c864fbd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7772,10 +7772,11 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - if (c->fc->nb_streams) { + if (c->avif_info) { av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); return 0; } + av_assert0(!c->fc->nb_streams); version = avio_r8(pb); avio_rb24(pb); // flags.

1 0

libavutil/hwcontext_cuda: don't destroy external context when using current CUDA context
by Roman Arzumanyan 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Roman Arzumanyan <r.arzumanyan(a)visionlabs.ai> | Fri Sep 29 15:36:31 2023 +0300| [f904e60c32a87f4124c3b94598a3b0141cd8b1b9] | committer: Timo Rothenpieler libavutil/hwcontext_cuda: don't destroy external context when using current CUDA context Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f904e60c32a87f412… --- libavutil/hwcontext_cuda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index c648723285..0312d3b9d7 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -290,7 +290,7 @@ static void cuda_device_uninit(AVHWDeviceContext *device_ctx) if (hwctx->internal->is_allocated && hwctx->cuda_ctx) { if (hwctx->internal->flags & AV_CUDA_USE_PRIMARY_CONTEXT) CHECK_CU(cu->cuDevicePrimaryCtxRelease(hwctx->internal->cuda_device)); - else + else if (!(hwctx->internal->flags & AV_CUDA_USE_CURRENT_CONTEXT)) CHECK_CU(cu->cuCtxDestroy(hwctx->cuda_ctx)); hwctx->cuda_ctx = NULL;

1 0

avformat/mxfdec: Remove this_partition
by Michael Niedermayer 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Sep 22 21:13:44 2023 +0200| [442d9412d21590c7a816118032c92070e00a1cc1] | committer: Michael Niedermayer avformat/mxfdec: Remove this_partition Suggested-by: Tomas Härdin <git(a)haerdin.se> Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-5130394286817280 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=442d9412d21590c7a… --- libavformat/mxfdec.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 4846c5d206..5fa2473e81 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -102,7 +102,6 @@ typedef struct MXFPartition { uint64_t previous_partition; int index_sid; int body_sid; - int64_t this_partition; int64_t essence_offset; ///< absolute offset of essence int64_t essence_length; int32_t kag_size; @@ -727,10 +726,13 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size UID op; uint64_t footer_partition; uint32_t nb_essence_containers; + uint64_t this_partition; if (mxf->partitions_count >= INT_MAX / 2) return AVERROR_INVALIDDATA; + av_assert0(klv_offset >= mxf->run_in); + tmp_part = av_realloc_array(mxf->partitions, mxf->partitions_count + 1, sizeof(*mxf->partitions)); if (!tmp_part) return AVERROR(ENOMEM); @@ -773,7 +775,13 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size partition->complete = uid[14] > 2; avio_skip(pb, 4); partition->kag_size = avio_rb32(pb); - partition->this_partition = avio_rb64(pb); + this_partition = avio_rb64(pb); + if (this_partition != klv_offset - mxf->run_in) { + av_log(mxf->fc, AV_LOG_ERROR, + "this_partition %"PRId64" mismatches %"PRId64"\n", + this_partition, klv_offset - mxf->run_in); + return AVERROR_INVALIDDATA; + } partition->previous_partition = avio_rb64(pb); footer_partition = avio_rb64(pb); partition->header_byte_count = avio_rb64(pb); @@ -793,8 +801,8 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size av_dict_set(&s->metadata, "operational_pattern_ul", str, 0); } - if (partition->this_partition && - partition->previous_partition == partition->this_partition) { + if (this_partition && + partition->previous_partition == this_partition) { av_log(mxf->fc, AV_LOG_ERROR, "PreviousPartition equal to ThisPartition %"PRIx64"\n", partition->previous_partition); @@ -802,11 +810,11 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size if (!mxf->parsing_backward && mxf->last_forward_partition > 1) { MXFPartition *prev = mxf->partitions + mxf->last_forward_partition - 2; - partition->previous_partition = prev->this_partition; + partition->previous_partition = prev->pack_ofs - mxf->run_in; } /* if no previous body partition are found point to the header * partition */ - if (partition->previous_partition == partition->this_partition) + if (partition->previous_partition == this_partition) partition->previous_partition = 0; av_log(mxf->fc, AV_LOG_ERROR, "Overriding PreviousPartition with %"PRIx64"\n", @@ -828,7 +836,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size "PartitionPack: ThisPartition = 0x%"PRIX64 ", PreviousPartition = 0x%"PRIX64", " "FooterPartition = 0x%"PRIX64", IndexSID = %i, BodySID = %i\n", - partition->this_partition, + this_partition, partition->previous_partition, footer_partition, partition->index_sid, partition->body_sid); @@ -902,7 +910,7 @@ static uint64_t partition_score(MXFPartition *p) score = 3; else score = 1; - return (score << 60) | ((uint64_t)p->this_partition >> 4); + return (score << 60) | ((uint64_t)p->pack_ofs >> 4); } static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set) @@ -3539,14 +3547,14 @@ static void mxf_compute_essence_containers(AVFormatContext *s) /* essence container spans to the next partition */ if (x < mxf->partitions_count - 1) - p->essence_length = mxf->partitions[x+1].this_partition - p->essence_offset; + p->essence_length = mxf->partitions[x+1].pack_ofs - mxf->run_in - p->essence_offset; if (p->essence_length < 0) { /* next ThisPartition < essence_offset */ p->essence_length = 0; av_log(mxf->fc, AV_LOG_ERROR, "partition %i: bad ThisPartition = %"PRIX64"\n", - x+1, mxf->partitions[x+1].this_partition); + x+1, mxf->partitions[x+1].pack_ofs - mxf->run_in); } } }

1 0

avcodec/ffv1*: add GBRAP14, GRAY14, YUVA422P12, YUVA444P12 formats support
by Paul B Mahol 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 21:22:34 2023 +0200| [3bbc7d799ccad01d66c09a6d4d96ef118d705243] | committer: Paul B Mahol avcodec/ffv1*: add GBRAP14, GRAY14, YUVA422P12, YUVA444P12 formats support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bbc7d799ccad01d6… --- libavcodec/ffv1dec.c | 11 +++++++++++ libavcodec/ffv1enc.c | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 54cf075b8f..cdf72a25dd 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -626,6 +626,9 @@ static int read_header(FFV1Context *f) } else if (f->avctx->bits_per_raw_sample == 12) { f->packed_at_lsb = 1; f->avctx->pix_fmt = AV_PIX_FMT_GRAY12; + } else if (f->avctx->bits_per_raw_sample == 14) { + f->packed_at_lsb = 1; + f->avctx->pix_fmt = AV_PIX_FMT_GRAY14; } else if (f->avctx->bits_per_raw_sample == 16) { f->packed_at_lsb = 1; f->avctx->pix_fmt = AV_PIX_FMT_GRAY16; @@ -690,6 +693,12 @@ static int read_header(FFV1Context *f) case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P12; break; case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P12; break; } + } else if (f->avctx->bits_per_raw_sample == 12 && f->transparency) { + f->packed_at_lsb = 1; + switch(16 * f->chroma_h_shift + f->chroma_v_shift) { + case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUVA444P12; break; + case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P12; break; + } } else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency) { f->packed_at_lsb = 1; switch(16 * f->chroma_h_shift + f->chroma_v_shift) { @@ -734,6 +743,8 @@ static int read_header(FFV1Context *f) f->avctx->pix_fmt = AV_PIX_FMT_GBRAP12; else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency) f->avctx->pix_fmt = AV_PIX_FMT_GBRP14; + else if (f->avctx->bits_per_raw_sample == 14 && f->transparency) + f->avctx->pix_fmt = AV_PIX_FMT_GBRAP14; else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency) { f->avctx->pix_fmt = AV_PIX_FMT_GBRP16; f->use32bit = 1; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 746f717568..2778c63012 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -585,8 +585,11 @@ static av_cold int encode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV440P12: case AV_PIX_FMT_YUV420P12: case AV_PIX_FMT_YUV422P12: + case AV_PIX_FMT_YUVA444P12: + case AV_PIX_FMT_YUVA422P12: if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 12; + case AV_PIX_FMT_GRAY14: case AV_PIX_FMT_YUV444P14: case AV_PIX_FMT_YUV420P14: case AV_PIX_FMT_YUV422P14: @@ -667,6 +670,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 12; case AV_PIX_FMT_GBRP14: + case AV_PIX_FMT_GBRAP14: if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 14; case AV_PIX_FMT_GBRP16: @@ -1284,13 +1288,14 @@ const FFCodec ff_ffv1_encoder = { AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_GRAY16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, - AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_YA8, - AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_RGBA64, AV_PIX_FMT_GRAY9,

1 0

avfilter/f_ebur128: do not print summary log if nothing was processed
by Paul B Mahol 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Sep 29 17:32:56 2023 +0200| [41f5b73903636e95cf74774331e9af7fd2fbc1e1] | committer: Paul B Mahol avfilter/f_ebur128: do not print summary log if nothing was processed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41f5b73903636e95c… --- libavfilter/f_ebur128.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index ca47a58334..a921602b44 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -1059,6 +1059,7 @@ static av_cold void uninit(AVFilterContext *ctx) ebur128->lra_high -= ebur128->pan_law; } + if (ebur128->nb_channels > 0) { av_log(ctx, AV_LOG_INFO, "Summary:\n\n" " Integrated loudness:\n" " I: %5.1f LUFS\n" @@ -1082,6 +1083,7 @@ static av_cold void uninit(AVFilterContext *ctx) PRINT_PEAK_SUMMARY("Sample", ebur128->sample_peak, SAMPLES); PRINT_PEAK_SUMMARY("True", ebur128->true_peak, TRUE); av_log(ctx, AV_LOG_INFO, "\n"); + } av_freep(&ebur128->y_line_ref); av_freep(&ebur128->x);

1 0

avformat/isom_tags: add missing CFHD tag
by Paul B Mahol 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Sep 29 16:38:09 2023 +0200| [8623067e8d95ff91fe64c0e5b7d552b7b0b328b2] | committer: Paul B Mahol avformat/isom_tags: add missing CFHD tag > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8623067e8d95ff91f… --- libavformat/isom_tags.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 4e0727bb45..a575b7c160 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -285,6 +285,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MEDIA100, MKTAG('d', 't', 'p', 'a') }, { AV_CODEC_ID_MEDIA100, MKTAG('d', 't', 'P', 'A') }, + { AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') }, + { AV_CODEC_ID_NONE, 0 }, };

1 0

avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx
by Andreas Rheinhardt 29 Sep '23

29 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:37:26 2023 +0200| [40aa451154fc54b661036bfb90532199269397bc] | committer: Andreas Rheinhardt avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx 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=40aa451154fc54b66… --- libavcodec/opus_silk.c | 10 +++++----- libavcodec/opus_silk.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index cf8b16acff..27671516a0 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -48,7 +48,7 @@ typedef struct SilkFrame { } SilkFrame; struct SilkContext { - AVCodecContext *avctx; + void *logctx; int output_channels; int midonly; @@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || coded_channels > 2 || duration_ms > 60) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " + av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed " "to the SILK decoder.\n"); return AVERROR(EINVAL); } @@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s) memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); } -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels) { SilkContext *s; if (output_channels != 1 && output_channels != 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", + av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", output_channels); return AVERROR(EINVAL); } @@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) if (!s) return AVERROR(ENOMEM); - s->avctx = avctx; + s->logctx = logctx; s->output_channels = output_channels; ff_silk_flush(s); diff --git a/libavcodec/opus_silk.h b/libavcodec/opus_silk.h index 6552c166a4..4b595da2b9 100644 --- a/libavcodec/opus_silk.h +++ b/libavcodec/opus_silk.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_OPUS_SILK_H #define AVCODEC_OPUS_SILK_H -#include "avcodec.h" #include "opus.h" #include "opus_rc.h" @@ -32,7 +31,7 @@ typedef struct SilkContext SilkContext; -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels); +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels); void ff_silk_free(SilkContext **ps); void ff_silk_flush(SilkContext *s);

1 0