Commit e658b103 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/avf_showvolume: make it possible to use current channel number in color expression

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent c3a5702e
......@@ -12158,6 +12158,9 @@ The expression can use the following variables:
@table @option
@item VOLUME
Current max volume of channel in dB.
@item CHANNEL
Current channel number, starting from 0.
@end table
@item t
......
......@@ -59,8 +59,8 @@ static const AVOption showvolume_options[] = {
AVFILTER_DEFINE_CLASS(showvolume);
static const char *const var_names[] = { "VOLUME", NULL };
enum { VAR_VOLUME, VAR_VARS_NB };
static const char *const var_names[] = { "VOLUME", "CHANNEL", NULL };
enum { VAR_VOLUME, VAR_CHANNEL, VAR_VARS_NB };
static av_cold int init(AVFilterContext *ctx)
{
......@@ -201,6 +201,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
max = av_clipf(max, 0, 1);
values[VAR_VOLUME] = 20.0 * log(max) / M_LN10;
values[VAR_CHANNEL] = c;
color = av_expr_eval(s->c_expr, values, NULL);
for (j = 0; j < s->h; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment