* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <ctype.h>
-#include <string.h>
+#include "config.h"
-#include "avfilter.h"
-#include "avfiltergraph.h"
-#include "formats.h"
-#include "internal.h"
+#include <string.h>
-#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
+#include "libavutil/internal.h"
#include "libavutil/log.h"
+#include "libavutil/opt.h"
+
+#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
+#include "thread.h"
+
+#define OFFSET(x) offsetof(AVFilterGraph, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption filtergraph_options[] = {
+ { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS,
+ { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" },
+ { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .flags = FLAGS, .unit = "thread_type" },
+ { "threads", "Maximum number of threads", OFFSET(nb_threads),
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
static const AVClass filtergraph_class = {
.class_name = "AVFilterGraph",
.item_name = av_default_item_name,
.version = LIBAVUTIL_VERSION_INT,
+ .option = filtergraph_options,
};
+#if !HAVE_THREADS
+void ff_graph_thread_free(AVFilterGraph *graph)
+{
+}
+
+int ff_graph_thread_init(AVFilterGraph *graph)
+{
+ graph->thread_type = 0;
+ graph->nb_threads = 1;
+ return 0;
+}
+#endif
+
AVFilterGraph *avfilter_graph_alloc(void)
{
- AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));
+ AVFilterGraph *ret = av_mallocz(sizeof(*ret));
if (!ret)
return NULL;
+
+ ret->internal = av_mallocz(sizeof(*ret->internal));
+ if (!ret->internal) {
+ av_freep(&ret);
+ return NULL;
+ }
+
ret->av_class = &filtergraph_class;
+ av_opt_set_defaults(ret);
+
return ret;
}
+void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter)
+{
+ int i;
+ for (i = 0; i < graph->nb_filters; i++) {
+ if (graph->filters[i] == filter) {
+ FFSWAP(AVFilterContext*, graph->filters[i],
+ graph->filters[graph->nb_filters - 1]);
+ graph->nb_filters--;
+ return;
+ }
+ }
+}
+
void avfilter_graph_free(AVFilterGraph **graph)
{
if (!*graph)
return;
- for (; (*graph)->filter_count > 0; (*graph)->filter_count--)
- avfilter_free((*graph)->filters[(*graph)->filter_count - 1]);
+
+ while ((*graph)->nb_filters)
+ avfilter_free((*graph)->filters[0]);
+
+ ff_graph_thread_free(*graph);
+
av_freep(&(*graph)->scale_sws_opts);
+ av_freep(&(*graph)->resample_lavr_opts);
av_freep(&(*graph)->filters);
+ av_freep(&(*graph)->internal);
av_freep(graph);
}
+#if FF_API_AVFILTER_OPEN
int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{
AVFilterContext **filters = av_realloc(graph->filters,
- sizeof(AVFilterContext*) * (graph->filter_count+1));
+ sizeof(*filters) * (graph->nb_filters + 1));
if (!filters)
return AVERROR(ENOMEM);
graph->filters = filters;
- graph->filters[graph->filter_count++] = filter;
+ graph->filters[graph->nb_filters++] = filter;
+
+#if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
+ graph->filter_count = graph->nb_filters;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ filter->graph = graph;
return 0;
}
+#endif
-int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
+int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
const char *name, const char *args, void *opaque,
AVFilterGraph *graph_ctx)
{
int ret;
- if ((ret = avfilter_open(filt_ctx, filt, name)) < 0)
- goto fail;
- if ((ret = avfilter_init_filter(*filt_ctx, args, opaque)) < 0)
- goto fail;
- if ((ret = avfilter_graph_add_filter(graph_ctx, *filt_ctx)) < 0)
+ *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name);
+ if (!*filt_ctx)
+ return AVERROR(ENOMEM);
+
+ ret = avfilter_init_str(*filt_ctx, args);
+ if (ret < 0)
goto fail;
+
return 0;
fail:
return ret;
}
+AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
+ const AVFilter *filter,
+ const char *name)
+{
+ AVFilterContext **filters, *s;
+
+ if (graph->thread_type && !graph->internal->thread_execute) {
+ if (graph->execute) {
+ graph->internal->thread_execute = graph->execute;
+ } else {
+ int ret = ff_graph_thread_init(graph);
+ if (ret < 0) {
+ av_log(graph, AV_LOG_ERROR, "Error initializing threading.\n");
+ return NULL;
+ }
+ }
+ }
+
+ s = ff_filter_alloc(filter, name);
+ if (!s)
+ return NULL;
+
+ filters = av_realloc(graph->filters, sizeof(*filters) * (graph->nb_filters + 1));
+ if (!filters) {
+ avfilter_free(s);
+ return NULL;
+ }
+
+ graph->filters = filters;
+ graph->filters[graph->nb_filters++] = s;
+
+#if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
+ graph->filter_count = graph->nb_filters;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ s->graph = graph;
+
+ return s;
+}
+
/**
* Check for the validity of graph.
*
AVFilterContext *filt;
int i, j;
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
filt = graph->filters[i];
for (j = 0; j < filt->nb_inputs; j++) {
AVFilterContext *filt;
int i, ret;
- for (i=0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
filt = graph->filters[i];
if (!filt->nb_outputs) {
{
int i;
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
if (graph->filters[i]->name && !strcmp(name, graph->filters[i]->name))
return graph->filters[i];
int scaler_count = 0, resampler_count = 0;
/* ask all the sub-filters for their supported media formats */
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
if (graph->filters[i]->filter->query_formats)
graph->filters[i]->filter->query_formats(graph->filters[i]);
else
}
/* go through and merge as many format lists as possible */
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
AVFilterContext *filter = graph->filters[i];
for (j = 0; j < filter->nb_inputs; j++) {
snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
scaler_count++);
- snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
+
if ((ret = avfilter_graph_create_filter(&convert, filter,
- inst_name, scale_args, NULL,
+ inst_name, graph->scale_sws_opts, NULL,
graph)) < 0)
return ret;
break;
snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d",
resampler_count++);
+ scale_args[0] = '\0';
+ if (graph->resample_lavr_opts)
+ snprintf(scale_args, sizeof(scale_args), "%s",
+ graph->resample_lavr_opts);
if ((ret = avfilter_graph_create_filter(&convert, filter,
- inst_name, NULL, NULL, graph)) < 0)
+ inst_name, scale_args,
+ NULL, graph)) < 0)
return ret;
break;
default:
if (!link || !link->in_formats)
return 0;
- link->in_formats->format_count = 1;
+ link->in_formats->nb_formats = 1;
link->format = link->in_formats->formats[0];
if (link->type == AVMEDIA_TYPE_AUDIO) {
- if (!link->in_samplerates->format_count) {
+ if (!link->in_samplerates->nb_formats) {
av_log(link->src, AV_LOG_ERROR, "Cannot select sample rate for"
" the link between filters %s and %s.\n", link->src->name,
link->dst->name);
return AVERROR(EINVAL);
}
- link->in_samplerates->format_count = 1;
+ link->in_samplerates->nb_formats = 1;
link->sample_rate = link->in_samplerates->formats[0];
if (!link->in_channel_layouts->nb_channel_layouts) {
int i, j, k, ret = 0;
REDUCE_FORMATS(int, AVFilterFormats, formats, formats,
- format_count, ff_add_format);
+ nb_formats, ff_add_format);
REDUCE_FORMATS(int, AVFilterFormats, samplerates, formats,
- format_count, ff_add_format);
+ nb_formats, ff_add_format);
REDUCE_FORMATS(uint64_t, AVFilterChannelLayouts, channel_layouts,
channel_layouts, nb_channel_layouts, ff_add_channel_layout);
do {
reduced = 0;
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
reduced |= reduce_formats_on_filter(graph->filters[i]);
} while (reduced);
}
link = filter->inputs[i];
if (link->type == AVMEDIA_TYPE_AUDIO &&
- link->out_samplerates->format_count == 1)
+ link->out_samplerates->nb_formats== 1)
break;
}
if (i == filter->nb_inputs)
int best_idx, best_diff = INT_MAX;
if (outlink->type != AVMEDIA_TYPE_AUDIO ||
- outlink->in_samplerates->format_count < 2)
+ outlink->in_samplerates->nb_formats < 2)
continue;
- for (j = 0; j < outlink->in_samplerates->format_count; j++) {
+ for (j = 0; j < outlink->in_samplerates->nb_formats; j++) {
int diff = abs(sample_rate - outlink->in_samplerates->formats[j]);
if (diff < best_diff) {
{
int i;
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
swap_samplerates_on_filter(graph->filters[i]);
}
for (i = 0; i < filter->nb_outputs; i++) {
AVFilterLink *outlink = filter->outputs[i];
- int best_idx, best_score = INT_MIN, best_count_diff = INT_MAX;
+ int best_idx = -1, best_score = INT_MIN, best_count_diff = INT_MAX;
if (outlink->type != AVMEDIA_TYPE_AUDIO ||
outlink->in_channel_layouts->nb_channel_layouts < 2)
best_count_diff = count_diff;
}
}
+ av_assert0(best_idx >= 0);
FFSWAP(uint64_t, outlink->in_channel_layouts->channel_layouts[0],
outlink->in_channel_layouts->channel_layouts[best_idx]);
}
{
int i;
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
swap_channel_layouts_on_filter(graph->filters[i]);
}
link = filter->inputs[i];
if (link->type == AVMEDIA_TYPE_AUDIO &&
- link->out_formats->format_count == 1)
+ link->out_formats->nb_formats == 1)
break;
}
if (i == filter->nb_inputs)
int best_idx = -1, best_score = INT_MIN;
if (outlink->type != AVMEDIA_TYPE_AUDIO ||
- outlink->in_formats->format_count < 2)
+ outlink->in_formats->nb_formats < 2)
continue;
- for (j = 0; j < outlink->in_formats->format_count; j++) {
+ for (j = 0; j < outlink->in_formats->nb_formats; j++) {
int out_format = outlink->in_formats->formats[j];
int out_bps = av_get_bytes_per_sample(out_format);
int score;
{
int i;
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
swap_sample_fmts_on_filter(graph->filters[i]);
}
{
int i, j, ret;
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
AVFilterContext *filter = graph->filters[i];
for (j = 0; j < filter->nb_inputs; j++)
int i, j, ret;
int fifo_count = 0;
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
f = graph->filters[i];
for (j = 0; j < f->nb_inputs; j++) {
projects / ffmpeg / blobdiff