Browse Source

lavfi/volume: implement process_command() callback, with the volume command

Address trac ticket #2868.
tags/n2.2-rc1
Stefano Sabatini 11 years ago
parent
commit
97aa554634
3 changed files with 32 additions and 2 deletions
  1. +14
    -1
      doc/filters.texi
  2. +17
    -0
      libavfilter/af_volume.c
  3. +1
    -1
      libavfilter/version.h

+ 14
- 1
doc/filters.texi View File

@@ -1828,7 +1828,8 @@ Set when the volume expression is evaluated.
It accepts the following values:
@table @samp
@item once
only evaluate expression once during the filter initialization
only evaluate expression once during the filter initialization, or
when the @samp{volume} command is sent

@item frame
evaluate expression for each incoming frame
@@ -1870,6 +1871,18 @@ Note that when @option{eval} is set to @samp{once} only the
@var{sample_rate} and @var{tb} variables are available, all other
variables will evaluate to NAN.

@subsection Commands

This filter supports the following commands:
@table @option
@item volume
Modify the volume expression.
The command accepts the same syntax of the corresponding option.

If the specified expression is not valid, it is kept at its current
value.
@end table

@subsection Examples

@itemize


+ 17
- 0
libavfilter/af_volume.c View File

@@ -296,6 +296,22 @@ static int config_output(AVFilterLink *outlink)
return set_volume(ctx);
}

static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
char *res, int res_len, int flags)
{
VolumeContext *vol = ctx->priv;
int ret = AVERROR(ENOSYS);

if (!strcmp(cmd, "volume")) {
if ((ret = set_expr(&vol->volume_pexpr, args, ctx)) < 0)
return ret;
if (vol->eval_mode == EVAL_MODE_ONCE)
set_volume(ctx);
}

return ret;
}

#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
@@ -403,4 +419,5 @@ AVFilter ff_af_volume = {
.inputs = avfilter_af_volume_inputs,
.outputs = avfilter_af_volume_outputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
.process_command = process_command,
};

+ 1
- 1
libavfilter/version.h View File

@@ -31,7 +31,7 @@

#define LIBAVFILTER_VERSION_MAJOR 4
#define LIBAVFILTER_VERSION_MINOR 0
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_MICRO 102

#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \


Loading…
Cancel
Save