mirror of https://git.ffmpeg.org/ffmpeg.git
avconv: use more descriptive names for hardcoded filters.
Also ensure that all such filters get a non-NULL name. Should fix FATE
failures on some architectures after
58b049f2fa
.
This commit is contained in:
parent
6fc7d9a078
commit
df98bf22cb
44
avconv.c
44
avconv.c
|
@ -622,11 +622,12 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
AVFilterContext *last_filter = out->filter_ctx;
|
AVFilterContext *last_filter = out->filter_ctx;
|
||||||
int pad_idx = out->pad_idx;
|
int pad_idx = out->pad_idx;
|
||||||
int ret;
|
int ret;
|
||||||
|
char name[255];
|
||||||
|
|
||||||
|
snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
|
||||||
ret = avfilter_graph_create_filter(&ofilter->filter,
|
ret = avfilter_graph_create_filter(&ofilter->filter,
|
||||||
avfilter_get_by_name("buffersink"),
|
avfilter_get_by_name("buffersink"),
|
||||||
"out", NULL, pix_fmts, fg->graph);
|
name, NULL, pix_fmts, fg->graph);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -638,8 +639,10 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
codec->width,
|
codec->width,
|
||||||
codec->height,
|
codec->height,
|
||||||
(unsigned)ost->sws_flags);
|
(unsigned)ost->sws_flags);
|
||||||
|
snprintf(name, sizeof(name), "scaler for output stream %d:%d",
|
||||||
|
ost->file_index, ost->index);
|
||||||
if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"),
|
if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"),
|
||||||
NULL, args, NULL, fg->graph)) < 0)
|
name, args, NULL, fg->graph)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)
|
if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -650,6 +653,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
|
|
||||||
if ((pix_fmts = choose_pix_fmts(ost))) {
|
if ((pix_fmts = choose_pix_fmts(ost))) {
|
||||||
AVFilterContext *filter;
|
AVFilterContext *filter;
|
||||||
|
snprintf(name, sizeof(name), "pixel format for output stream %d:%d",
|
||||||
|
ost->file_index, ost->index);
|
||||||
if ((ret = avfilter_graph_create_filter(&filter,
|
if ((ret = avfilter_graph_create_filter(&filter,
|
||||||
avfilter_get_by_name("format"),
|
avfilter_get_by_name("format"),
|
||||||
"format", pix_fmts, NULL,
|
"format", pix_fmts, NULL,
|
||||||
|
@ -669,8 +674,10 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
|
|
||||||
snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num,
|
snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num,
|
||||||
ost->frame_rate.den);
|
ost->frame_rate.den);
|
||||||
|
snprintf(name, sizeof(name), "fps for output stream %d:%d",
|
||||||
|
ost->file_index, ost->index);
|
||||||
ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"),
|
ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"),
|
||||||
"fps", args, NULL, fg->graph);
|
name, args, NULL, fg->graph);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -694,11 +701,14 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
AVFilterContext *last_filter = out->filter_ctx;
|
AVFilterContext *last_filter = out->filter_ctx;
|
||||||
int pad_idx = out->pad_idx;
|
int pad_idx = out->pad_idx;
|
||||||
char *sample_fmts, *sample_rates, *channel_layouts;
|
char *sample_fmts, *sample_rates, *channel_layouts;
|
||||||
|
char name[255];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
||||||
|
snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
|
||||||
ret = avfilter_graph_create_filter(&ofilter->filter,
|
ret = avfilter_graph_create_filter(&ofilter->filter,
|
||||||
avfilter_get_by_name("abuffersink"),
|
avfilter_get_by_name("abuffersink"),
|
||||||
"out", NULL, NULL, fg->graph);
|
name, NULL, NULL, fg->graph);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -728,9 +738,11 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
|
||||||
av_freep(&sample_rates);
|
av_freep(&sample_rates);
|
||||||
av_freep(&channel_layouts);
|
av_freep(&channel_layouts);
|
||||||
|
|
||||||
|
snprintf(name, sizeof(name), "audio format for output stream %d:%d",
|
||||||
|
ost->file_index, ost->index);
|
||||||
ret = avfilter_graph_create_filter(&format,
|
ret = avfilter_graph_create_filter(&format,
|
||||||
avfilter_get_by_name("aformat"),
|
avfilter_get_by_name("aformat"),
|
||||||
"aformat", args, NULL, fg->graph);
|
name, args, NULL, fg->graph);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -787,7 +799,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
ist->framerate.num} :
|
ist->framerate.num} :
|
||||||
ist->st->time_base;
|
ist->st->time_base;
|
||||||
AVRational sar;
|
AVRational sar;
|
||||||
char args[255];
|
char args[255], name[255];
|
||||||
int pad_idx = in->pad_idx;
|
int pad_idx = in->pad_idx;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -797,17 +809,21 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
|
snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
|
||||||
ist->st->codec->height, ist->st->codec->pix_fmt,
|
ist->st->codec->height, ist->st->codec->pix_fmt,
|
||||||
tb.num, tb.den, sar.num, sar.den);
|
tb.num, tb.den, sar.num, sar.den);
|
||||||
|
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
|
||||||
|
ist->file_index, ist->st->index);
|
||||||
|
|
||||||
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, in->name,
|
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name,
|
||||||
args, NULL, fg->graph)) < 0)
|
args, NULL, fg->graph)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (ist->framerate.num) {
|
if (ist->framerate.num) {
|
||||||
AVFilterContext *setpts;
|
AVFilterContext *setpts;
|
||||||
|
|
||||||
|
snprintf(name, sizeof(name), "force CFR for input from stream %d:%d",
|
||||||
|
ist->file_index, ist->st->index);
|
||||||
if ((ret = avfilter_graph_create_filter(&setpts,
|
if ((ret = avfilter_graph_create_filter(&setpts,
|
||||||
avfilter_get_by_name("setpts"),
|
avfilter_get_by_name("setpts"),
|
||||||
"setpts", "N", NULL,
|
name, "N", NULL,
|
||||||
fg->graph)) < 0)
|
fg->graph)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -830,7 +846,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
AVFilter *filter = avfilter_get_by_name("abuffer");
|
AVFilter *filter = avfilter_get_by_name("abuffer");
|
||||||
InputStream *ist = ifilter->ist;
|
InputStream *ist = ifilter->ist;
|
||||||
int pad_idx = in->pad_idx;
|
int pad_idx = in->pad_idx;
|
||||||
char args[255];
|
char args[255], name[255];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s"
|
snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s"
|
||||||
|
@ -839,9 +855,11 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
ist->st->codec->sample_rate,
|
ist->st->codec->sample_rate,
|
||||||
av_get_sample_fmt_name(ist->st->codec->sample_fmt),
|
av_get_sample_fmt_name(ist->st->codec->sample_fmt),
|
||||||
ist->st->codec->channel_layout);
|
ist->st->codec->channel_layout);
|
||||||
|
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
|
||||||
|
ist->file_index, ist->st->index);
|
||||||
|
|
||||||
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter,
|
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter,
|
||||||
in->name, args, NULL,
|
name, args, NULL,
|
||||||
fg->graph)) < 0)
|
fg->graph)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -859,9 +877,11 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
snprintf(args + len, sizeof(args) - len, "min_delta=%f",
|
snprintf(args + len, sizeof(args) - len, "min_delta=%f",
|
||||||
audio_drift_threshold);
|
audio_drift_threshold);
|
||||||
|
|
||||||
|
snprintf(name, sizeof(name), "graph %d audio sync for input stream %d:%d",
|
||||||
|
fg->index, ist->file_index, ist->st->index);
|
||||||
ret = avfilter_graph_create_filter(&async,
|
ret = avfilter_graph_create_filter(&async,
|
||||||
avfilter_get_by_name("asyncts"),
|
avfilter_get_by_name("asyncts"),
|
||||||
"async", args, NULL, fg->graph);
|
name, args, NULL, fg->graph);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue