generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/anullsrc: fix format negotiation

Browse Source 
Samplerate and channel layouts must be set in query_formats.
This commit is contained in:
Stefano Sabatini 2013-03-22 01:35:13 +01:00
parent e54eb8db9c
commit 5373a2a221
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/asrc_anullsrc.c
View File

@ -81,15 +81,25 @@ static int init(AVFilterContext *ctx, const char *args)
return 0; return 0;
} }
static int query_formats(AVFilterContext *ctx)
{
ANullContext *null = ctx->priv;
int64_t chlayouts[] = { null->channel_layout, -1 };
int sample_rates[] = { null->sample_rate, -1 };
ff_set_common_formats (ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO));
ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
ff_set_common_samplerates (ctx, ff_make_format_list(sample_rates));
return 0;
}
static int config_props(AVFilterLink *outlink) static int config_props(AVFilterLink *outlink)
{ {
ANullContext *null = outlink->src->priv; ANullContext *null = outlink->src->priv;
char buf[128]; char buf[128];
int chans_nb; int chans_nb;
outlink->sample_rate = null->sample_rate;
outlink->channel_layout = null->channel_layout;
chans_nb = av_get_channel_layout_nb_channels(null->channel_layout); chans_nb = av_get_channel_layout_nb_channels(null->channel_layout);
av_get_channel_layout_string(buf, sizeof(buf), chans_nb, null->channel_layout); av_get_channel_layout_string(buf, sizeof(buf), chans_nb, null->channel_layout);
av_log(outlink->src, AV_LOG_VERBOSE, av_log(outlink->src, AV_LOG_VERBOSE,
@ -132,6 +142,7 @@ AVFilter avfilter_asrc_anullsrc = {
.description = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."), .description = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."),
.init = init, .init = init,
.query_formats = query_formats,
.priv_size = sizeof(ANullContext), .priv_size = sizeof(ANullContext),
.inputs = NULL, .inputs = NULL,