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

avfilter/avf_showvolume: support unknown channel layouts too

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-02-28 22:52:44 +01:00
parent 1492507208
commit 65cc3915db
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/avf_showvolume.c
View File

@ -102,7 +102,7 @@ static int query_formats(AVFilterContext *ctx)
if ((ret = ff_formats_ref(formats, &inlink->out_formats)) < 0) if ((ret = ff_formats_ref(formats, &inlink->out_formats)) < 0)
return ret; return ret;
layouts = ff_all_channel_layouts(); layouts = ff_all_channel_counts();
if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0) if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0)
return ret; return ret;
@ -242,9 +242,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
} }
} }
if (outlink->h > 40 && s->draw_text) if (outlink->h > 40 && s->draw_text) {
drawtext(s->out, c * (s->h + s->b) + (s->h - 10) / 2, outlink->h - 35, const char *channel_name = av_get_channel_name(av_channel_layout_extract_channel(insamples->channel_layout, c));
av_get_channel_name(av_channel_layout_extract_channel(insamples->channel_layout, c)), 1); if (!channel_name)
continue;
drawtext(s->out, c * (s->h + s->b) + (s->h - 10) / 2, outlink->h - 35, channel_name, 1);
}
} }
} else { } else {
for (c = 0; c < inlink->channels; c++) { for (c = 0; c < inlink->channels; c++) {
@ -270,9 +273,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
} }
} }
if (s->h >= 8 && s->draw_text) if (s->h >= 8 && s->draw_text) {
drawtext(s->out, 2, c * (s->h + s->b) + (s->h - 8) / 2, const char *channel_name = av_get_channel_name(av_channel_layout_extract_channel(insamples->channel_layout, c));
av_get_channel_name(av_channel_layout_extract_channel(insamples->channel_layout, c)), 0); if (!channel_name)
continue;
drawtext(s->out, 2, c * (s->h + s->b) + (s->h - 8) / 2, channel_name, 0);
}
} }
} }