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

avfiltergraph: avoid harmful auto audio conversions. 

With the current code, an automatically inserted aconvert necessary
for format change would usually convert to mono for no good reason.

The new code will not avoid all conversions, but at least will keep
them among the layouts common to both filters.
This commit is contained in:
Nicolas George 2012-02-16 16:49:43 +01:00
parent 69a653cac3
commit 42655b24c2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/avfiltergraph.c
View File

@ -187,6 +187,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
{ {
int i, j, ret; int i, j, ret;
char filt_args[128]; char filt_args[128];
AVFilterFormats *formats, *chlayouts, *packing;
/* ask all the sub-filters for their supported media formats */ /* ask all the sub-filters for their supported media formats */
for (i = 0; i < graph->filter_count; i++) { for (i = 0; i < graph->filter_count; i++) {
@ -221,9 +222,13 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
!link->in_packing || !link->out_packing) !link->in_packing || !link->out_packing)
return AVERROR(EINVAL); return AVERROR(EINVAL);
if (!avfilter_merge_formats(link->in_formats, link->out_formats) || /* Merge all three list before checking: that way, in all
!avfilter_merge_formats(link->in_chlayouts, link->out_chlayouts) || * three categories, aconvert will use a common format
!avfilter_merge_formats(link->in_packing, link->out_packing)) * whenever possible. */
formats = avfilter_merge_formats(link->in_formats, link->out_formats);
chlayouts = avfilter_merge_formats(link->in_chlayouts, link->out_chlayouts);
packing = avfilter_merge_formats(link->in_packing, link->out_packing);
if (!formats || !chlayouts || !packing)
if (ret = insert_conv_filter(graph, link, "aconvert", NULL)) if (ret = insert_conv_filter(graph, link, "aconvert", NULL))
return ret; return ret;
} }