October 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/af_afade: Remove impossible branch
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 27 03:55:43 2021 +0200| [1f387ae4cb49070b3594086abd59027f07b4a773] | committer: Andreas Rheinhardt avfilter/af_afade: Remove impossible branch Also don't call ff_inlink_queued_samples() unnecessarily often. Fixes Coverity issue 1427665. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f387ae4cb49070b3… --- libavfilter/af_afade.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 3bd0331e77..aecbb44f70 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -483,20 +483,18 @@ static int activate(AVFilterContext *ctx) } } - if (ff_inlink_queued_samples(ctx->inputs[0]) > s->nb_samples) { - nb_samples = ff_inlink_queued_samples(ctx->inputs[0]) - s->nb_samples; - if (nb_samples > 0) { - ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in); - if (ret < 0) { - return ret; - } - } + nb_samples = ff_inlink_queued_samples(ctx->inputs[0]); + if (nb_samples > s->nb_samples) { + nb_samples -= s->nb_samples; + ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in); + if (ret < 0) + return ret; in->pts = s->pts; s->pts += av_rescale_q(in->nb_samples, (AVRational){ 1, outlink->sample_rate }, outlink->time_base); return ff_filter_frame(outlink, in); - } else if (ff_inlink_queued_samples(ctx->inputs[0]) >= s->nb_samples && - ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples && s->cf0_eof) { + } else if (s->cf0_eof && nb_samples >= s->nb_samples && + ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples) { if (s->overlap) { out = ff_get_audio_buffer(outlink, s->nb_samples); if (!out)

1 0

avfilter/formats: Update outdated comment
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 27 03:24:18 2021 +0200| [797fefa2e51e57b87ec5b13849465437acc75164] | committer: Andreas Rheinhardt avfilter/formats: Update outdated comment Forgotten in 06754f7bbf341062581accc27b5cce353e99fd82. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=797fefa2e51e57b87… --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 29e318aa3b..ec3b8ebd8d 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -58,7 +58,7 @@ do { \ * If check is set, nothing is modified and it is only checked whether * the formats are compatible. * If empty_allowed is set and one of a,b->nb is zero, the lists are - * merged; otherwise, it is treated as error. + * merged; otherwise, 0 (for nonmergeability) is returned. */ #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed) \ do { \

1 0

avfilter/formats: Don't unnecessarily reget pixfmt descriptor
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 27 03:02:17 2021 +0200| [e1ddaf229d801bf9c1b09e46841cbba300b945b6] | committer: Andreas Rheinhardt avfilter/formats: Don't unnecessarily reget pixfmt descriptor Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1ddaf229d801bf9c… --- libavfilter/formats.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 1d2a51c0af..29e318aa3b 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -113,9 +113,9 @@ static int merge_formats_internal(AVFilterFormats *a, AVFilterFormats *b, To avoid that, pretend that there are no common formats to force the insertion of a conversion filter. */ if (type == AVMEDIA_TYPE_VIDEO) - for (i = 0; i < a->nb_formats; i++) + for (i = 0; i < a->nb_formats; i++) { + const AVPixFmtDescriptor *const adesc = av_pix_fmt_desc_get(a->formats[i]); for (j = 0; j < b->nb_formats; j++) { - const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]); const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]); alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA; chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1; @@ -124,6 +124,7 @@ static int merge_formats_internal(AVFilterFormats *a, AVFilterFormats *b, chroma1|= adesc->nb_components > 1; } } + } // If chroma or alpha can be lost through merging then do not merge if (alpha2 > alpha1 || chroma2 > chroma1)

1 0

avfilter/f_reverse: Don't use redundant query_formats function
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 27 23:45:45 2021 +0200| [3a82bb8128773b82f50194cad6b3f3405084f59c] | committer: Andreas Rheinhardt avfilter/f_reverse: Don't use redundant query_formats function Said function did exactly what ff_default_query_formats() does for audio; so just remove it, so that ff_default_query_formats() will be called. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a82bb8128773b82f… --- libavfilter/f_reverse.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 82f0c705a2..0398aa9cb0 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -145,19 +145,6 @@ const AVFilter ff_vf_reverse = { #if CONFIG_AREVERSE_FILTER -static int query_formats(AVFilterContext *ctx) -{ - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO)); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void reverse_samples_planar(AVFrame *out) { for (int p = 0; p < out->channels; p++) { @@ -283,7 +270,6 @@ static const AVFilterPad areverse_outputs[] = { const AVFilter ff_af_areverse = { .name = "areverse", .description = NULL_IF_CONFIG_SMALL("Reverse an audio clip."), - .query_formats = query_formats, .priv_size = sizeof(ReverseContext), .init = init, .uninit = uninit,

1 0

avfilter/avfilter: Remove unused buffer
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Oct 2 07:27:03 2021 +0200| [c1f7e628101be1e99e01fe8df915e0ed2fff959b] | committer: Andreas Rheinhardt avfilter/avfilter: Remove unused buffer Unused since the removal of ff_get_ref_perms_string() in a05a44e205d6ae13d5eb1cd8d4ad2dba6ec940b3. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1f7e628101be1e99… --- libavfilter/avfilter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f325918021..d70db1b283 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -49,7 +49,6 @@ const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; void ff_tlog_ref(void *ctx, AVFrame *ref, int end) { - av_unused char buf[16]; ff_tlog(ctx, "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, ref, ref->buf, ref->data[0],

1 0

avfilter/avfiltergraph: Remove always-true check
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 28 08:41:00 2021 +0200| [e1874cd3c41753451827c23b6803648f37e196e8] | committer: Andreas Rheinhardt avfilter/avfiltergraph: Remove always-true check Always true since bc1a985ba030e9861d24965d42792850b43a43ea. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1874cd3c41753451… --- libavfilter/avfiltergraph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index d1b121cc17..6dcff95ac4 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -154,8 +154,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *fil return 0; fail: - if (*filt_ctx) - avfilter_free(*filt_ctx); + avfilter_free(*filt_ctx); *filt_ctx = NULL; return ret; }

1 0

avfilter/avfiltergraph: Free AVFilterGraph options properly
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 28 08:32:30 2021 +0200| [0615a39fed74c3d557c54ddb3c646bf98aa6bcf0] | committer: Andreas Rheinhardt avfilter/avfiltergraph: Free AVFilterGraph options properly Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0615a39fed74c3d55… --- libavfilter/avfiltergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index ee0c82030d..d1b121cc17 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -130,8 +130,8 @@ void avfilter_graph_free(AVFilterGraph **graph) av_freep(&(*graph)->sink_links); - av_freep(&(*graph)->scale_sws_opts); - av_freep(&(*graph)->aresample_swr_opts); + av_opt_free(*graph); + av_freep(&(*graph)->filters); av_freep(&(*graph)->internal); av_freep(graph);

1 0

avfilter/avfiltergraph: Simplify adding filter to graph
by Andreas Rheinhardt 02 Oct '21

02 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 28 08:07:43 2021 +0200| [22c4f3399133a62aa11f4af01e7dacea08d4ddae] | committer: Andreas Rheinhardt avfilter/avfiltergraph: Simplify adding filter to graph By reallocating the array of pointers to the AVFilterContexts before allocating the new AVFilterContext one can avoid freeing the new AVFilterContext in case the array could not be reallocated. Also switch to av_realloc_array() while just at it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22c4f3399133a62aa… --- libavfilter/avfiltergraph.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 45b028cd9c..ee0c82030d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -183,17 +183,15 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, } } - s = ff_filter_alloc(filter, name); - if (!s) + filters = av_realloc_array(graph->filters, graph->nb_filters + 1, sizeof(*filters)); + if (!filters) return NULL; + graph->filters = filters; - filters = av_realloc(graph->filters, sizeof(*filters) * (graph->nb_filters + 1)); - if (!filters) { - avfilter_free(s); + s = ff_filter_alloc(filter, name); + if (!s) return NULL; - } - graph->filters = filters; graph->filters[graph->nb_filters++] = s; s->graph = graph;

1 0

lavf/movenc: Write 'dby1' minor brand if Dolby content is being muxed to MP4
by Derek Buitenhuis 01 Oct '21

01 Oct '21

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Tue Aug 3 17:13:42 2021 +0100| [68815d67919a6975357ad214d8fe8ac4c886e47c] | committer: Derek Buitenhuis lavf/movenc: Write 'dby1' minor brand if Dolby content is being muxed to MP4 This is as per: * mp4ra: http://mp4ra.org/#/brands * Dolby Vision muxing spec (which is public): https://professional.dolby.com/siteassets/content-creation/dolby-vision-for… Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68815d67919a69753… --- libavformat/movenc.c | 9 ++++++++- tests/ref/fate/copy-trac3074 | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7650ac5ed3..1a2f24c410 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4991,7 +4991,7 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) { MOVMuxContext *mov = s->priv_data; int64_t pos = avio_tell(pb); - int has_h264 = 0, has_av1 = 0, has_video = 0; + int has_h264 = 0, has_av1 = 0, has_video = 0, has_dolby = 0; int i; for (i = 0; i < s->nb_streams; i++) { @@ -5004,6 +5004,11 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) has_h264 = 1; if (st->codecpar->codec_id == AV_CODEC_ID_AV1) has_av1 = 1; + if (st->codecpar->codec_id == AV_CODEC_ID_AC3 || + st->codecpar->codec_id == AV_CODEC_ID_EAC3 || + st->codecpar->codec_id == AV_CODEC_ID_TRUEHD || + av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL)) + has_dolby = 1; } avio_wb32(pb, 0); /* size */ @@ -5029,6 +5034,8 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) ffio_wfourcc(pb, "iso6"); if (has_av1) ffio_wfourcc(pb, "av01"); + if (has_dolby) + ffio_wfourcc(pb, "dby1"); } else { if (mov->flags & FF_MOV_FLAG_FRAGMENT) ffio_wfourcc(pb, "iso6"); diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074 index e541af03da..4748296c2a 100644 --- a/tests/ref/fate/copy-trac3074 +++ b/tests/ref/fate/copy-trac3074 @@ -1,5 +1,5 @@ -da6122873fb83ce4340cf5d0ab8d475e *tests/data/fate/copy-trac3074.mp4 -334012 tests/data/fate/copy-trac3074.mp4 +452d91e7c6889b787717fef25b6fce43 *tests/data/fate/copy-trac3074.mp4 +334016 tests/data/fate/copy-trac3074.mp4 #tb 0: 1/48000 #media_type 0: audio #codec_id 0: eac3

1 0