X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favfiltergraph.c;h=c97e495c96dc1e517395fd5edd28aa7fa735b079;hb=16b771b1f47daa9fec84477040984d83a92ba4a6;hp=8c43251c4cc11ce32fc1ef3a41fe0961351513ec;hpb=57fa314090ab006808911fd790053b534749aa53;p=ffmpeg diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 8c43251c4cc..c97e495c96d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -3,26 +3,27 @@ * Copyright (c) 2008 Vitor Sessak * Copyright (c) 2007 Bobby Bingham * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include +#include "libavutil/audioconvert.h" #include "avfilter.h" #include "avfiltergraph.h" #include "internal.h" @@ -135,11 +136,57 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name) return NULL; } +static int insert_conv_filter(AVFilterGraph *graph, AVFilterLink *link, + const char *filt_name, const char *filt_args) +{ + static int auto_count = 0, ret; + char inst_name[32]; + AVFilterContext *filt_ctx; + + snprintf(inst_name, sizeof(inst_name), "auto-inserted %s %d", + filt_name, auto_count++); + + if ((ret = avfilter_graph_create_filter(&filt_ctx, + avfilter_get_by_name(filt_name), + inst_name, filt_args, NULL, graph)) < 0) + return ret; + if ((ret = avfilter_insert_filter(link, filt_ctx, 0, 0)) < 0) + return ret; + + filt_ctx->filter->query_formats(filt_ctx); + + if ( ((link = filt_ctx-> inputs[0]) && + !avfilter_merge_formats(link->in_formats, link->out_formats)) || + ((link = filt_ctx->outputs[0]) && + !avfilter_merge_formats(link->in_formats, link->out_formats)) + ) { + av_log(NULL, AV_LOG_ERROR, + "Impossible to convert between the formats supported by the filter " + "'%s' and the filter '%s'\n", link->src->name, link->dst->name); + return AVERROR(EINVAL); + } + + if (link->type == AVMEDIA_TYPE_AUDIO && + (((link = filt_ctx-> inputs[0]) && + (!avfilter_merge_formats(link->in_chlayouts, link->out_chlayouts) || + !avfilter_merge_formats(link->in_packing, link->out_packing))) || + ((link = filt_ctx->outputs[0]) && + (!avfilter_merge_formats(link->in_chlayouts, link->out_chlayouts) || + !avfilter_merge_formats(link->in_packing, link->out_packing)))) + ) { + av_log(NULL, AV_LOG_ERROR, + "Impossible to convert between the channel layouts/packing formats supported by the filter " + "'%s' and the filter '%s'\n", link->src->name, link->dst->name); + return AVERROR(EINVAL); + } + + return 0; +} + static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) { int i, j, ret; - int scaler_count = 0; - char inst_name[30]; + char filt_args[128]; /* ask all the sub-filters for their supported media formats */ for (i = 0; i < graph->filter_count; i++) { @@ -155,32 +202,30 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) for (j = 0; j < filter->input_count; j++) { AVFilterLink *link = filter->inputs[j]; - if (link && link->in_formats != link->out_formats) { - if (!avfilter_merge_formats(link->in_formats, - link->out_formats)) { - AVFilterContext *scale; - char scale_args[256]; - /* couldn't merge format lists. auto-insert scale filter */ - 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(&scale, avfilter_get_by_name("scale"), - inst_name, scale_args, NULL, graph)) < 0) - return ret; - if ((ret = avfilter_insert_filter(link, scale, 0, 0)) < 0) - return ret; - - scale->filter->query_formats(scale); - if (((link = scale-> inputs[0]) && - !avfilter_merge_formats(link->in_formats, link->out_formats)) || - ((link = scale->outputs[0]) && - !avfilter_merge_formats(link->in_formats, link->out_formats))) { - av_log(log_ctx, AV_LOG_ERROR, - "Impossible to convert between the formats supported by the filter " - "'%s' and the filter '%s'\n", link->src->name, link->dst->name); - return AVERROR(EINVAL); - } - } + if (!link) continue; + + if (!link->in_formats || !link->out_formats) + return AVERROR(EINVAL); + + if (link->type == AVMEDIA_TYPE_VIDEO && + !avfilter_merge_formats(link->in_formats, link->out_formats)) { + + /* couldn't merge format lists, auto-insert scale filter */ + snprintf(filt_args, sizeof(filt_args), "0:0:%s", + graph->scale_sws_opts); + if (ret = insert_conv_filter(graph, link, "scale", filt_args)) + return ret; + } + else if (link->type == AVMEDIA_TYPE_AUDIO) { + if (!link->in_chlayouts || !link->out_chlayouts || + !link->in_packing || !link->out_packing) + return AVERROR(EINVAL); + + if (!avfilter_merge_formats(link->in_formats, link->out_formats) || + !avfilter_merge_formats(link->in_chlayouts, link->out_chlayouts) || + !avfilter_merge_formats(link->in_packing, link->out_packing)) + if (ret = insert_conv_filter(graph, link, "aconvert", NULL)) + return ret; } } } @@ -195,9 +240,20 @@ static void pick_format(AVFilterLink *link) link->in_formats->format_count = 1; link->format = link->in_formats->formats[0]; - avfilter_formats_unref(&link->in_formats); avfilter_formats_unref(&link->out_formats); + + if (link->type == AVMEDIA_TYPE_AUDIO) { + link->in_chlayouts->format_count = 1; + link->channel_layout = link->in_chlayouts->formats[0]; + avfilter_formats_unref(&link->in_chlayouts); + avfilter_formats_unref(&link->out_chlayouts); + + link->in_packing->format_count = 1; + link->planar = link->in_packing->formats[0] == AVFILTER_PLANAR; + avfilter_formats_unref(&link->in_packing); + avfilter_formats_unref(&link->out_packing); + } } static void pick_formats(AVFilterGraph *graph) @@ -242,3 +298,61 @@ int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) return 0; } + +int avfilter_graph_send_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, char *res, int res_len, int flags) +{ + int i, r = AVERROR(ENOSYS); + + if(!graph) + return r; + + if((flags & AVFILTER_CMD_FLAG_ONE) && !(flags & AVFILTER_CMD_FLAG_FAST)) { + r=avfilter_graph_send_command(graph, target, cmd, arg, res, res_len, flags | AVFILTER_CMD_FLAG_FAST); + if(r != AVERROR(ENOSYS)) + return r; + } + + if(res_len && res) + res[0]= 0; + + for (i = 0; i < graph->filter_count; i++) { + AVFilterContext *filter = graph->filters[i]; + if(!strcmp(target, "all") || (filter->name && !strcmp(target, filter->name)) || !strcmp(target, filter->filter->name)){ + r = avfilter_process_command(filter, cmd, arg, res, res_len, flags); + if(r != AVERROR(ENOSYS)) { + if((flags & AVFILTER_CMD_FLAG_ONE) || r<0) + return r; + } + } + } + + return r; +} + +int avfilter_graph_queue_command(AVFilterGraph *graph, const char *target, const char *command, const char *arg, int flags, double ts) +{ + int i; + + if(!graph) + return 0; + + for (i = 0; i < graph->filter_count; i++) { + AVFilterContext *filter = graph->filters[i]; + if(filter && (!strcmp(target, "all") || !strcmp(target, filter->name) || !strcmp(target, filter->filter->name))){ + AVFilterCommand **que = &filter->command_queue, *next; + while(*que && (*que)->time <= ts) + que = &(*que)->next; + next= *que; + *que= av_mallocz(sizeof(AVFilterCommand)); + (*que)->command = av_strdup(command); + (*que)->arg = av_strdup(arg); + (*que)->time = ts; + (*que)->flags = flags; + (*que)->next = next; + if(flags & AVFILTER_CMD_FLAG_ONE) + return 0; + } + } + + return 0; +}