Browse Source

lavfi/asetnsamples: switch to an AVOptions-based system.

tags/n2.0
Clément Bœsch 13 years ago
parent
commit
e2e992c077
3 changed files with 6 additions and 15 deletions
  1. +1
    -2
      doc/filters.texi
  2. +5
    -12
      libavfilter/af_asetnsamples.c
  3. +0
    -1
      libavfilter/avfilter.c

+ 1
- 2
doc/filters.texi View File

@@ -902,8 +902,7 @@ The last output packet may contain a different number of samples, as
the filter will flush all the remaining samples when the input audio
signal its end.

The filter accepts parameters as a list of @var{key}=@var{value} pairs,
separated by ":".
The filter accepts the following options:

@table @option



+ 5
- 12
libavfilter/af_asetnsamples.c View File

@@ -45,11 +45,11 @@ typedef struct {
#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM

static const AVOption asetnsamples_options[] = {
{ "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ "nb_out_samples", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
{ "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
{ NULL }
{ "nb_out_samples", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
{ "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
{ "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ NULL }
};

AVFILTER_DEFINE_CLASS(asetnsamples);
@@ -57,13 +57,6 @@ AVFILTER_DEFINE_CLASS(asetnsamples);
static av_cold int init(AVFilterContext *ctx, const char *args)
{
ASNSContext *asns = ctx->priv;
int err;

asns->class = &asetnsamples_class;
av_opt_set_defaults(asns);

if ((err = av_set_options_string(asns, args, "=", ":")) < 0)
return err;

asns->next_out_pts = AV_NOPTS_VALUE;
av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);


+ 0
- 1
libavfilter/avfilter.c View File

@@ -677,7 +677,6 @@ static const char *const filters_left_to_update[] = {
"aevalsrc",
"amerge",
"aresample",
"asetnsamples",
"atempo",
"buffer",
"flite",


Loading…
Cancel
Save