RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/formats: Don't set samplerate or channel count on video links 

This currently happens by accident in a few filters that use
ff_set_common_(samplerates|channel_layouts) like afir (if the response
option is set) or agraphmonitor (due to the default code in
avfiltergraph.c). So change those functions to make sure it does no
longer happen.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-15 10:15:09 +02:00
parent 79595024ed
commit 4f46c3cf5c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/formats.c
View File

@ -622,14 +622,16 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
FORMATS_CHANGEREF(oldref, newref); FORMATS_CHANGEREF(oldref, newref);
} }
#define SET_COMMON_FORMATS(ctx, fmts, ref_fn, unref_fn) \ #define SET_COMMON_FORMATS(ctx, fmts, media_type, ref_fn, unref_fn) \
int i; \ int i; \
\ \
if (!fmts) \ if (!fmts) \
return AVERROR(ENOMEM); \ return AVERROR(ENOMEM); \
\ \
for (i = 0; i < ctx->nb_inputs; i++) { \ for (i = 0; i < ctx->nb_inputs; i++) { \
if (ctx->inputs[i] && !ctx->inputs[i]->outcfg.fmts) { \ AVFilterLink *const link = ctx->inputs[i]; \
if (link && !link->outcfg.fmts && \
(media_type == AVMEDIA_TYPE_UNKNOWN || link->type == media_type)) { \
int ret = ref_fn(fmts, &ctx->inputs[i]->outcfg.fmts); \ int ret = ref_fn(fmts, &ctx->inputs[i]->outcfg.fmts); \
if (ret < 0) { \ if (ret < 0) { \
return ret; \ return ret; \
@ -637,7 +639,9 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
} \ } \
} \ } \
for (i = 0; i < ctx->nb_outputs; i++) { \ for (i = 0; i < ctx->nb_outputs; i++) { \
if (ctx->outputs[i] && !ctx->outputs[i]->incfg.fmts) { \ AVFilterLink *const link = ctx->outputs[i]; \
if (link && !link->incfg.fmts && \
(media_type == AVMEDIA_TYPE_UNKNOWN || link->type == media_type)) { \
int ret = ref_fn(fmts, &ctx->outputs[i]->incfg.fmts); \ int ret = ref_fn(fmts, &ctx->outputs[i]->incfg.fmts); \
if (ret < 0) { \ if (ret < 0) { \
return ret; \ return ret; \
@ -653,7 +657,7 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
int ff_set_common_channel_layouts(AVFilterContext *ctx, int ff_set_common_channel_layouts(AVFilterContext *ctx,
AVFilterChannelLayouts *channel_layouts) AVFilterChannelLayouts *channel_layouts)
{ {
SET_COMMON_FORMATS(ctx, channel_layouts, SET_COMMON_FORMATS(ctx, channel_layouts, AVMEDIA_TYPE_AUDIO,
ff_channel_layouts_ref, ff_channel_layouts_unref); ff_channel_layouts_ref, ff_channel_layouts_unref);
} }
@ -671,7 +675,7 @@ int ff_set_common_all_channel_counts(AVFilterContext *ctx)
int ff_set_common_samplerates(AVFilterContext *ctx, int ff_set_common_samplerates(AVFilterContext *ctx,
AVFilterFormats *samplerates) AVFilterFormats *samplerates)
{ {
SET_COMMON_FORMATS(ctx, samplerates, SET_COMMON_FORMATS(ctx, samplerates, AVMEDIA_TYPE_AUDIO,
ff_formats_ref, ff_formats_unref); ff_formats_ref, ff_formats_unref);
} }
@ -693,7 +697,7 @@ int ff_set_common_all_samplerates(AVFilterContext *ctx)
*/ */
int ff_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats) int ff_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats)
{ {
SET_COMMON_FORMATS(ctx, formats, SET_COMMON_FORMATS(ctx, formats, AVMEDIA_TYPE_UNKNOWN,
ff_formats_ref, ff_formats_unref); ff_formats_ref, ff_formats_unref);
} }

6
libavfilter/formats.h
View File

@ -129,9 +129,9 @@ av_warn_unused_result
AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts); AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts);
/** /**
* A helper for query_formats() which sets all links to the same list of channel * Helpers for query_formats() which set all free audio links to the same list
* layouts/sample rates. If there are no links hooked to this filter, the list * of channel layouts/sample rates. If there are no links hooked to this list,
* is freed. * the list is freed.
*/ */
av_warn_unused_result av_warn_unused_result
int ff_set_common_channel_layouts(AVFilterContext *ctx, int ff_set_common_channel_layouts(AVFilterContext *ctx,