MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/avf_showvolume: draw channel names directly into output frame

Browse Source
This commit is contained in:
Paul B Mahol 2023-11-18 23:21:30 +01:00
parent fbc7adba67
commit 3ed2225a9d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/avf_showvolume.c
View File

@ -379,13 +379,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
}
}
if (s->h >= 8 && s->draw_text) {
int ret = av_channel_name(channel_name, sizeof(channel_name), av_channel_layout_channel_from_index(&insamples->ch_layout, c));
if (ret < 0)
continue;
drawtext(s->out, c * (s->h + s->b) + (s->h - 10) / 2, outlink->h - 35, channel_name, 1);
}
if (s->draw_persistent_duration > 0.) {
calc_persistent_max(s, max, c);
max_draw = FFMAX(0, calc_max_draw(s, outlink, s->max_persistent[c]) - 1);
@ -415,13 +408,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
}
}
if (s->h >= 8 && s->draw_text) {
int ret = av_channel_name(channel_name, sizeof(channel_name), av_channel_layout_channel_from_index(&insamples->ch_layout, c));
if (ret < 0)
continue;
drawtext(s->out, 2, c * (s->h + s->b) + (s->h - 8) / 2, channel_name, 0);
}
if (s->draw_persistent_duration > 0.) {
calc_persistent_max(s, max, c);
max_draw = FFMAX(0, calc_max_draw(s, outlink, s->max_persistent[c]) - 1);
@ -440,6 +426,21 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
return ret;
}
/* draw channel names */
for (c = 0; c < inlink->ch_layout.nb_channels && s->h >= 10 && s->draw_text; c++) {
if (s->orientation) { /* vertical */
int ret = av_channel_name(channel_name, sizeof(channel_name), av_channel_layout_channel_from_index(&inlink->ch_layout, c));
if (ret < 0)
continue;
drawtext(out, c * (s->h + s->b) + (s->h - 10) / 2, outlink->h - 35, channel_name, 1);
} else { /* horizontal */
int ret = av_channel_name(channel_name, sizeof(channel_name), av_channel_layout_channel_from_index(&inlink->ch_layout, c));
if (ret < 0)
continue;
drawtext(out, 2, c * (s->h + s->b) + (s->h - 8) / 2, channel_name, 0);
}
}
/* draw volume level */
for (c = 0; c < inlink->ch_layout.nb_channels && s->h >= 8 && s->draw_volume; c++) {
char buf[16];