From b357835252a75cfb821807c250a5273c22550741 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sat, 31 Mar 2018 15:51:18 +0200 Subject: [PATCH 3/5] avfilter/showvolume : indent after prev commit and add comment --- libavfilter/avf_showvolume.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c index 4f31cebc7b..7fe3916855 100644 --- a/libavfilter/avf_showvolume.c +++ b/libavfilter/avf_showvolume.c @@ -358,15 +358,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) return AVERROR(ENOMEM); av_frame_make_writable(out); + /* draw volume level */ for (c = 0; c < inlink->channels && s->h >= 8 && s->draw_volume; c++) { char buf[16]; - if (s->orientation) { - snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]); - drawtext(out, c * (s->h + s->b) + (s->h - 8) / 2, 2, buf, 1); - } else { - snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]); - drawtext(out, FFMAX(0, s->w - 8 * (int)strlen(buf)), c * (s->h + s->b) + (s->h - 8) / 2, buf, 0); + if (s->orientation) { /* vertical */ + snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]); + drawtext(out, c * (s->h + s->b) + (s->h - 8) / 2, 2, buf, 1); + } else { /* horizontal */ + snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]); + drawtext(out, FFMAX(0, s->w - 8 * (int)strlen(buf)), c * (s->h + s->b) + (s->h - 8) / 2, buf, 0); } } -- 2.14.3 (Apple Git-98)