[FFmpeg-cvslog] avfilter/avf_showvolume: use current peak value for picking colors

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Aug 18 20:14:58 2016 +0200| [e2a39b103e5917780744fed6fd4336cf65a220f4] | committer: Paul B Mahol

avfilter/avf_showvolume: use current peak value for picking colors

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2a39b103e5917780744fed6fd4336cf65a220f4
---

 doc/filters.texi             | 3 +++
 libavfilter/avf_showvolume.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index cbe95aa..8ae9c42 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -16899,6 +16899,9 @@ The expression can use the following variables:
 @item VOLUME
 Current max volume of channel in dB.
 
+ at item PEAK
+Current peak.
+
 @item CHANNEL
 Current channel number, starting from 0.
 @end table
diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c
index 3454370..5967ed3 100644
--- a/libavfilter/avf_showvolume.c
+++ b/libavfilter/avf_showvolume.c
@@ -31,8 +31,8 @@
 #include "video.h"
 #include "internal.h"
 
-static const char *const var_names[] = {   "VOLUME",   "CHANNEL",        NULL };
-enum                                   { VAR_VOLUME, VAR_CHANNEL, VAR_VARS_NB };
+static const char *const var_names[] = {   "VOLUME",   "CHANNEL",   "PEAK",        NULL };
+enum                                   { VAR_VOLUME, VAR_CHANNEL, VAR_PEAK, VAR_VARS_NB };
 
 typedef struct ShowVolumeContext {
     const AVClass *class;
@@ -61,7 +61,7 @@ static const AVOption showvolume_options[] = {
     { "w", "set channel width",  OFFSET(w), AV_OPT_TYPE_INT, {.i64=400}, 80, 8192, FLAGS },
     { "h", "set channel height", OFFSET(h), AV_OPT_TYPE_INT, {.i64=20}, 1, 900, FLAGS },
     { "f", "set fade",           OFFSET(f), AV_OPT_TYPE_DOUBLE, {.dbl=0.95}, 0.001, 1, FLAGS },
-    { "c", "set volume color expression", OFFSET(color), AV_OPT_TYPE_STRING, {.str="if(gte(VOLUME,-6), if(gte(VOLUME,-2), if(gte(VOLUME,-1), if(gt(VOLUME,0), 0xff0000ff, 0xff0066ff), 0xff00ffff),0xff00ff00),0xffff0000)"}, 0, 0, FLAGS },
+    { "c", "set volume color expression", OFFSET(color), AV_OPT_TYPE_STRING, {.str="PEAK*255+floor((1-PEAK)*255)*256"}, 0, 0, FLAGS },
     { "t", "display channel names", OFFSET(draw_text), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS },
     { "v", "display volume value", OFFSET(draw_volume), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS },
     { "o", "set orientation", OFFSET(orientation), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "orientation" },
@@ -228,6 +228,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
             for (i = 0; i < insamples->nb_samples; i++)
                 max = FFMAX(max, src[i]);
 
+            s->values[c * VAR_VARS_NB + VAR_PEAK] = max;
             s->values[c * VAR_VARS_NB + VAR_VOLUME] = 20.0 * log10(max);
             max = av_clipf(max, 0, 1);
             s->values[c * VAR_VARS_NB + VAR_CHANNEL] = c;
@@ -258,6 +259,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
             for (i = 0; i < insamples->nb_samples; i++)
                 max = FFMAX(max, src[i]);
 
+            s->values[c * VAR_VARS_NB + VAR_PEAK] = max;
             s->values[c * VAR_VARS_NB + VAR_VOLUME] = 20.0 * log10(max);
             max = av_clipf(max, 0, 1);
             s->values[c * VAR_VARS_NB + VAR_CHANNEL] = c;