History

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

Clément Bœsch committed 13 years ago

Commit e2e992c1 parent 1c0feee3 files · +6 −15Browse files

Unified · Split

3 files
  1. doc/filters.texi +1 −2
  2. libavfilter/af_asetnsamples.c +5 −12
  3. libavfilter/avfilter.c +0 −1
doc/filters.texi+1−2
@@ -902,8 +902,7 @@ The last output packet may contain a different number of samples, as · 901 unmodified lines
902the filter will flush all the remaining samples when the input audio902the filter will flush all the remaining samples when the input audio
903signal its end.903signal its end.
904 904
905The filter accepts parameters as a list of @var{key}=@var{value} pairs,905The filter accepts the following options:
906separated by ":".
907 906
908@table @option907@table @option
909 908
libavfilter/af_asetnsamples.c+5−12
@@ -45,11 +45,11 @@ typedef struct { · 44 unmodified lines
45#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM45#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
46 46
47static const AVOption asetnsamples_options[] = {47static const AVOption asetnsamples_options[] = {
48{ "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },48 { "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 },
49{ "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },49 { "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
50{ "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 },50 { "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
51{ "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },51 { "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
52{ NULL }52 { NULL }
53};53};
54 54
55AVFILTER_DEFINE_CLASS(asetnsamples);55AVFILTER_DEFINE_CLASS(asetnsamples);
@@ -57,13 +57,6 @@ AVFILTER_DEFINE_CLASS(asetnsamples); · 1 unmodified line
57static av_cold int init(AVFilterContext *ctx, const char *args)57static av_cold int init(AVFilterContext *ctx, const char *args)
58{58{
59 ASNSContext *asns = ctx->priv;59 ASNSContext *asns = ctx->priv;
60 int err;
61
62 asns->class = &asetnsamples_class;
63 av_opt_set_defaults(asns);
64
65 if ((err = av_set_options_string(asns, args, "=", ":")) < 0)
66 return err;
67 60
68 asns->next_out_pts = AV_NOPTS_VALUE;61 asns->next_out_pts = AV_NOPTS_VALUE;
69 av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);62 av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);
libavfilter/avfilter.c+0−1
@@ -677,7 +677,6 @@ static const char *const filters_left_to_update[] = { · 676 unmodified lines
677 "aevalsrc",677 "aevalsrc",
678 "amerge",678 "amerge",
679 "aresample",679 "aresample",
680 "asetnsamples",
681 "atempo",680 "atempo",
682 "buffer",681 "buffer",
683 "flite",682 "flite",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t