summaryrefslogtreecommitdiff
path: root/libavfilter/af_resample.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-25 21:21:29 +0100
committerAnton Khirnov <anton@khirnov.net>2013-04-09 18:45:50 +0200
commit4fa1f52e33b70029e2b621852f3af7c1ef9aecff (patch)
treeb10b0e58b3d71ab977510bd477beaf9f3fb61e52 /libavfilter/af_resample.c
parentb439c992c23f3e0f3832fffd2a34a664b236c525 (diff)
af_resample: switch to an AVOptions-based system.
Diffstat (limited to 'libavfilter/af_resample.c')
-rw-r--r--libavfilter/af_resample.c57
1 files changed, 41 insertions, 16 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index f82a970bb3..7e86684c64 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -37,6 +37,7 @@
#include "internal.h"
typedef struct ResampleContext {
+ const AVClass *class;
AVAudioResampleContext *avr;
AVDictionary *options;
@@ -46,26 +47,30 @@ typedef struct ResampleContext {
int got_output;
} ResampleContext;
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx, AVDictionary **opts)
{
ResampleContext *s = ctx->priv;
+ const AVClass *avr_class = avresample_get_class();
+ AVDictionaryEntry *e = NULL;
- if (args) {
- int ret = av_dict_parse_string(&s->options, args, "=", ":", 0);
- if (ret < 0) {
- av_log(ctx, AV_LOG_ERROR, "error setting option string: %s\n", args);
- return ret;
- }
-
- /* do not allow the user to override basic format options */
- av_dict_set(&s->options, "in_channel_layout", NULL, 0);
- av_dict_set(&s->options, "out_channel_layout", NULL, 0);
- av_dict_set(&s->options, "in_sample_fmt", NULL, 0);
- av_dict_set(&s->options, "out_sample_fmt", NULL, 0);
- av_dict_set(&s->options, "in_sample_rate", NULL, 0);
- av_dict_set(&s->options, "out_sample_rate", NULL, 0);
+ while ((e = av_dict_get(*opts, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ if (av_opt_find(&avr_class, e->key, NULL, 0,
+ AV_OPT_SEARCH_FAKE_OBJ | AV_OPT_SEARCH_CHILDREN))
+ av_dict_set(&s->options, e->key, e->value, 0);
}
+ e = NULL;
+ while ((e = av_dict_get(s->options, "", e, AV_DICT_IGNORE_SUFFIX)))
+ av_dict_set(opts, e->key, NULL, 0);
+
+ /* do not allow the user to override basic format options */
+ av_dict_set(&s->options, "in_channel_layout", NULL, 0);
+ av_dict_set(&s->options, "out_channel_layout", NULL, 0);
+ av_dict_set(&s->options, "in_sample_fmt", NULL, 0);
+ av_dict_set(&s->options, "out_sample_fmt", NULL, 0);
+ av_dict_set(&s->options, "in_sample_rate", NULL, 0);
+ av_dict_set(&s->options, "out_sample_rate", NULL, 0);
+
return 0;
}
@@ -272,6 +277,25 @@ fail:
return ret;
}
+static const AVClass *resample_child_class_next(const AVClass *prev)
+{
+ return prev ? NULL : avresample_get_class();
+}
+
+static void *resample_child_next(void *obj, void *prev)
+{
+ ResampleContext *s = obj;
+ return prev ? NULL : s->avr;
+}
+
+static const AVClass resample_class = {
+ .class_name = "resample",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ .child_class_next = resample_child_class_next,
+ .child_next = resample_child_next,
+};
+
static const AVFilterPad avfilter_af_resample_inputs[] = {
{
.name = "default",
@@ -295,8 +319,9 @@ AVFilter avfilter_af_resample = {
.name = "resample",
.description = NULL_IF_CONFIG_SMALL("Audio resampling and conversion."),
.priv_size = sizeof(ResampleContext),
+ .priv_class = &resample_class,
- .init = init,
+ .init_dict = init,
.uninit = uninit,
.query_formats = query_formats,