[FFmpeg-cvslog] avfilter/showvolume : indent after prev commit and add comment
Martin Vignali
git at videolan.org
Sun Apr 1 16:49:45 EEST 2018
ffmpeg | branch: master | Martin Vignali <martin.vignali at gmail.com> | Sat Mar 31 15:51:18 2018 +0200| [78b6887da3b926db7df64807ef6f3026136921fc] | committer: Paul B Mahol
avfilter/showvolume : indent after prev commit and add comment
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78b6887da3b926db7df64807ef6f3026136921fc
---
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);
}
}
More information about the ffmpeg-cvslog
mailing list