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

af_pan: reindent after last commit.

This commit is contained in:
Nicolas George 2012-02-20 20:15:09 +01:00
parent a44b510d56
commit a297856b8c
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavfilter/af_pan.c
View File

@ -235,24 +235,23 @@ static int config_props(AVFilterLink *link)
} }
} }
/* TODO reindent */ // sanity check; can't be done in query_formats since the inlink
// sanity check; can't be done in query_formats since the inlink // channel layout is unknown at that time
// channel layout is unknown at that time if (pan->nb_input_channels > SWR_CH_MAX ||
if (pan->nb_input_channels > SWR_CH_MAX || pan->nb_output_channels > SWR_CH_MAX) {
pan->nb_output_channels > SWR_CH_MAX) { av_log(ctx, AV_LOG_ERROR,
av_log(ctx, AV_LOG_ERROR, "libswresample support a maximum of %d channels. "
"libswresample support a maximum of %d channels. " "Feel free to ask for a higher limit.\n", SWR_CH_MAX);
"Feel free to ask for a higher limit.\n", SWR_CH_MAX); return AVERROR_PATCHWELCOME;
return AVERROR_PATCHWELCOME; }
}
// init libswresample context // init libswresample context
pan->swr = swr_alloc_set_opts(pan->swr, pan->swr = swr_alloc_set_opts(pan->swr,
pan->out_channel_layout, link->format, link->sample_rate, pan->out_channel_layout, link->format, link->sample_rate,
link->channel_layout, link->format, link->sample_rate, link->channel_layout, link->format, link->sample_rate,
0, ctx); 0, ctx);
if (!pan->swr) if (!pan->swr)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
// gains are pure, init the channel mapping // gains are pure, init the channel mapping
if (pan->pure_gains) { if (pan->pure_gains) {
@ -365,12 +364,11 @@ static int query_formats(AVFilterContext *ctx)
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
AVFilterFormats *formats; AVFilterFormats *formats;
/* TODO reindent */ pan->pure_gains = are_gains_pure(pan);
pan->pure_gains = are_gains_pure(pan); /* libswr supports any sample and packing formats */
/* libswr supports any sample and packing formats */ avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO));
avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO)); avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats());
avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats()); pan->filter_samples = filter_samples_channel_mapping;
pan->filter_samples = filter_samples_channel_mapping;
// inlink supports any channel layout // inlink supports any channel layout
formats = avfilter_make_all_channel_layouts(); formats = avfilter_make_all_channel_layouts();