diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 17:01:41 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 17:08:40 +0400 |
commit | 835cc0f2e7098fbb548d7622110c4fdc0831809d (patch) | |
tree | 22408566623b068dd3eb0ab2a49751fb1ecde67d /libavfilter | |
parent | f4db6bfeb86feda2aeb98072e55b55de85ba0962 (diff) | |
parent | fa2a34cd40d124161c748bb0f430dc63c94dd0da (diff) |
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.c | 55 | ||||
-rw-r--r-- | libavfilter/avfilter.h | 16 | ||||
-rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 46 insertions, 28 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index e03b6f2f61..484eda1c7f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -386,55 +386,53 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha return AVERROR(ENOSYS); } -#define MAX_REGISTERED_AVFILTERS_NB 256 - -static AVFilter *registered_avfilters[MAX_REGISTERED_AVFILTERS_NB + 1]; - -static int next_registered_avfilter_idx = 0; +static AVFilter *first_filter; AVFilter *avfilter_get_by_name(const char *name) { - int i; + AVFilter *f = NULL; - for (i = 0; registered_avfilters[i]; i++) - if (!strcmp(registered_avfilters[i]->name, name)) - return registered_avfilters[i]; + while ((f = avfilter_next(f))) + if (!strcmp(f->name, name)) + return f; return NULL; } int avfilter_register(AVFilter *filter) { + AVFilter **f = &first_filter; int i; - if (next_registered_avfilter_idx == MAX_REGISTERED_AVFILTERS_NB) { - av_log(NULL, AV_LOG_ERROR, - "Maximum number of registered filters %d reached, " - "impossible to register filter with name '%s'\n", - MAX_REGISTERED_AVFILTERS_NB, filter->name); - return AVERROR(ENOMEM); - } - for(i=0; filter->inputs && filter->inputs[i].name; i++) { const AVFilterPad *input = &filter->inputs[i]; av_assert0( !input->filter_frame || (!input->start_frame && !input->end_frame)); } - registered_avfilters[next_registered_avfilter_idx++] = filter; + while (*f) + f = &(*f)->next; + *f = filter; + filter->next = NULL; + return 0; } +const AVFilter *avfilter_next(const AVFilter *prev) +{ + return prev ? prev->next : first_filter; +} + +#if FF_API_OLD_FILTER_REGISTER AVFilter **av_filter_next(AVFilter **filter) { - return filter ? ++filter : ®istered_avfilters[0]; + return filter ? &(*filter)->next : &first_filter; } void avfilter_uninit(void) { - memset(registered_avfilters, 0, sizeof(registered_avfilters)); - next_registered_avfilter_idx = 0; } +#endif int avfilter_pad_count(const AVFilterPad *pads) { @@ -463,21 +461,22 @@ static void *filter_child_next(void *obj, void *prev) static const AVClass *filter_child_class_next(const AVClass *prev) { - AVFilter **f = NULL; + AVFilter *f = NULL; /* find the filter that corresponds to prev */ - while (prev && *(f = av_filter_next(f))) - if ((*f)->priv_class == prev) + while (prev && (f = avfilter_next(f))) + if (f->priv_class == prev) break; /* could not find filter corresponding to prev */ - if (prev && !(*f)) + if (prev && !f) return NULL; /* find next filter with specific options */ - while (*(f = av_filter_next(f))) - if ((*f)->priv_class) - return (*f)->priv_class; + while ((f = avfilter_next(f))) + if (f->priv_class) + return f->priv_class; + return NULL; } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 4bc97554fe..44143b010a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -496,6 +496,8 @@ typedef struct AVFilter { int priv_size; ///< size of private data to allocate for the filter + struct AVFilter *next; + /** * Make the filter instance process a command. * @@ -837,8 +839,11 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha /** Initialize the filter system. Register all builtin filters. */ void avfilter_register_all(void); +#if FF_API_OLD_FILTER_REGISTER /** Uninitialize the filter system. Unregister all filters. */ +attribute_deprecated void avfilter_uninit(void); +#endif /** * Register a filter. This is only needed if you plan to use @@ -862,12 +867,23 @@ int avfilter_register(AVFilter *filter); AVFilter *avfilter_get_by_name(const char *name); /** + * Iterate over all registered filters. + * @return If prev is non-NULL, next registered filter after prev or NULL if + * prev is the last filter. If prev is NULL, return the first registered filter. + */ +const AVFilter *avfilter_next(const AVFilter *prev); + +#if FF_API_OLD_FILTER_REGISTER +/** * If filter is NULL, returns a pointer to the first registered filter pointer, * if filter is non-NULL, returns the next pointer after filter. * If the returned pointer points to NULL, the last registered filter * was already reached. + * @deprecated use avfilter_next() */ +attribute_deprecated AVFilter **av_filter_next(AVFilter **filter); +#endif #if FF_API_AVFILTER_OPEN /** diff --git a/libavfilter/version.h b/libavfilter/version.h index ef14ae9bfc..3112dd5cd0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -75,5 +75,8 @@ #ifndef FF_API_AVFILTER_INIT_FILTER #define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_OLD_FILTER_REGISTER +#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |