virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi: autoinsert resample filter when necessary.

Browse Source
This commit is contained in:
Anton Khirnov
2012-05-04 15:35:12 +02:00
parent d371e7b988
commit 012f04a277
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
libavfilter/avfiltergraph.c
View File

@@ -152,8 +152,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
{ {
int i, j, ret; int i, j, ret;
int scaler_count = 0; int scaler_count = 0, resampler_count = 0;
char inst_name[30];
/* ask all the sub-filters for their supported media formats */ /* ask all the sub-filters for their supported media formats */
for (i = 0; i < graph->filter_count; i++) { for (i = 0; i < graph->filter_count; i++) {
@@ -172,23 +171,50 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
if (link && link->in_formats != link->out_formats) { if (link && link->in_formats != link->out_formats) {
if (!avfilter_merge_formats(link->in_formats, if (!avfilter_merge_formats(link->in_formats,
link->out_formats)) { link->out_formats)) {
AVFilterContext *scale; AVFilterContext *convert;
AVFilter *filter;
AVFilterLink *inlink, *outlink;
char scale_args[256]; char scale_args[256];
/* couldn't merge format lists. auto-insert scale filter */ char inst_name[30];
snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
scaler_count++); /* couldn't merge format lists. auto-insert conversion filter */
snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts); switch (link->type) {
if ((ret = avfilter_graph_create_filter(&scale, avfilter_get_by_name("scale"), case AVMEDIA_TYPE_VIDEO:
inst_name, scale_args, NULL, graph)) < 0) snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
return ret; scaler_count++);
if ((ret = avfilter_insert_filter(link, scale, 0, 0)) < 0) snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
if ((ret = avfilter_graph_create_filter(&convert,
avfilter_get_by_name("scale"),
inst_name, scale_args, NULL,
graph)) < 0)
return ret;
break;
case AVMEDIA_TYPE_AUDIO:
if (!(filter = avfilter_get_by_name("resample"))) {
av_log(log_ctx, AV_LOG_ERROR, "'resample' filter "
"not present, cannot convert audio formats.\n");
return AVERROR(EINVAL);
}
snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d",
resampler_count++);
if ((ret = avfilter_graph_create_filter(&convert,
avfilter_get_by_name("resample"),
inst_name, NULL, NULL, graph)) < 0)
return ret;
break;
default:
return AVERROR(EINVAL);
}
if ((ret = avfilter_insert_filter(link, convert, 0, 0)) < 0)
return ret; return ret;
scale->filter->query_formats(scale); convert->filter->query_formats(convert);
if (((link = scale-> inputs[0]) && inlink = convert->inputs[0];
!avfilter_merge_formats(link->in_formats, link->out_formats)) || outlink = convert->outputs[0];
((link = scale->outputs[0]) && if (!avfilter_merge_formats( inlink->in_formats, inlink->out_formats) ||
!avfilter_merge_formats(link->in_formats, link->out_formats))) { !avfilter_merge_formats(outlink->in_formats, outlink->out_formats)) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Impossible to convert between the formats supported by the filter " "Impossible to convert between the formats supported by the filter "
"'%s' and the filter '%s'\n", link->src->name, link->dst->name); "'%s' and the filter '%s'\n", link->src->name, link->dst->name);