X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avconv_filter.c;h=e54da56c7a0fdc8b7984fd3e3553264d5652e791;hb=a9b201cacf85d710b102010cb4baef97f00ea39b;hp=da55d3c89fd8616065e74c9b5d987c5d26b68d45;hpb=51fc88e7467169031b20b9983d80456b893a9fa3;p=ffmpeg diff --git a/avconv_filter.c b/avconv_filter.c index da55d3c89fd..e54da56c7a0 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "avconv.h" #include "libavfilter/avfilter.h" @@ -37,8 +39,8 @@ #define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name) \ static char *choose_ ## var ## s(OutputStream *ost) \ { \ - if (ost->st->codec->var != none) { \ - get_name(ost->st->codec->var); \ + if (ost->enc_ctx->var != none) { \ + get_name(ost->enc_ctx->var); \ return av_strdup(name); \ } else if (ost->enc && ost->enc->supported_list) { \ const type *p; \ @@ -147,12 +149,12 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) /* find the first unused stream of corresponding type */ for (i = 0; i < nb_input_streams; i++) { ist = input_streams[i]; - if (ist->st->codec->codec_type == type && ist->discard) + if (ist->dec_ctx->codec_type == type && ist->discard) break; } if (i == nb_input_streams) { av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for " - "unlabeled input pad %d on filter %s", in->pad_idx, + "unlabeled input pad %d on filter %s\n", in->pad_idx, in->filter_ctx->name); exit(1); } @@ -173,17 +175,18 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1]; } -static int insert_trim(OutputStream *ost, AVFilterContext **last_filter, int *pad_idx) +static int insert_trim(int64_t start_time, int64_t duration, + AVFilterContext **last_filter, int *pad_idx, + const char *filter_name) { - OutputFile *of = output_files[ost->file_index]; AVFilterGraph *graph = (*last_filter)->graph; AVFilterContext *ctx; const AVFilter *trim; - const char *name = ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO ? "trim" : "atrim"; - char filter_name[128]; + enum AVMediaType type = avfilter_pad_get_type((*last_filter)->output_pads, *pad_idx); + const char *name = (type == AVMEDIA_TYPE_VIDEO) ? "trim" : "atrim"; int ret = 0; - if (of->recording_time == INT64_MAX && !of->start_time) + if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE) return 0; trim = avfilter_get_by_name(name); @@ -193,18 +196,16 @@ static int insert_trim(OutputStream *ost, AVFilterContext **last_filter, int *pa return AVERROR_FILTER_NOT_FOUND; } - snprintf(filter_name, sizeof(filter_name), "%s for output stream %d:%d", - name, ost->file_index, ost->index); ctx = avfilter_graph_alloc_filter(graph, trim, filter_name); if (!ctx) return AVERROR(ENOMEM); - if (of->recording_time != INT64_MAX) { - ret = av_opt_set_double(ctx, "duration", (double)of->recording_time / 1e6, + if (duration != INT64_MAX) { + ret = av_opt_set_double(ctx, "duration", (double)duration / 1e6, AV_OPT_SEARCH_CHILDREN); } - if (ret >= 0 && of->start_time) { - ret = av_opt_set_double(ctx, "start", (double)of->start_time / 1e6, + if (ret >= 0 && start_time != AV_NOPTS_VALUE) { + ret = av_opt_set_double(ctx, "start", (double)start_time / 1e6, AV_OPT_SEARCH_CHILDREN); } if (ret < 0) { @@ -229,7 +230,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, { char *pix_fmts; OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; + OutputFile *of = output_files[ost->file_index]; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; int ret; @@ -266,17 +268,17 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, 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, - avfilter_get_by_name("format"), - "format", pix_fmts, NULL, - fg->graph)) < 0) + ret = avfilter_graph_create_filter(&filter, + avfilter_get_by_name("format"), + "format", pix_fmts, NULL, fg->graph); + av_freep(&pix_fmts); + if (ret < 0) return ret; if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) return ret; last_filter = filter; pad_idx = 0; - av_freep(&pix_fmts); } if (ost->frame_rate.num) { @@ -299,7 +301,10 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } - ret = insert_trim(ost, &last_filter, &pad_idx); + snprintf(name, sizeof(name), "trim for output stream %d:%d", + ost->file_index, ost->index); + ret = insert_trim(of->start_time, of->recording_time, + &last_filter, &pad_idx, name); if (ret < 0) return ret; @@ -313,7 +318,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; + OutputFile *of = output_files[ost->file_index]; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; char *sample_fmts, *sample_rates, *channel_layouts; @@ -370,7 +376,10 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } - ret = insert_trim(ost, &last_filter, &pad_idx); + snprintf(name, sizeof(name), "trim for output stream %d:%d", + ost->file_index, ost->index); + ret = insert_trim(of->start_time, of->recording_time, + &last_filter, &pad_idx, name); if (ret < 0) return ret; @@ -384,7 +393,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, { \ AVFilterContext *ctx = inout->filter_ctx; \ AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \ - int nb_pads = in ? ctx->input_count : ctx->output_count; \ + int nb_pads = in ? ctx->nb_inputs : ctx->nb_outputs; \ AVIOContext *pb; \ \ if (avio_open_dyn_buf(&pb) < 0) \ @@ -412,21 +421,22 @@ int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOu static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { - AVFilterContext *first_filter = in->filter_ctx; + AVFilterContext *last_filter; const AVFilter *buffer_filt = avfilter_get_by_name("buffer"); InputStream *ist = ifilter->ist; + InputFile *f = input_files[ist->file_index]; AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : ist->st->time_base; AVRational sar; char args[255], name[255]; - int pad_idx = in->pad_idx; - int ret; + int ret, pad_idx = 0; sar = ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio : - ist->st->codec->sample_aspect_ratio; - 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->dec_ctx->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->dec_ctx->width, + ist->dec_ctx->height, + ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->dec_ctx->pix_fmt, 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); @@ -434,6 +444,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, if ((ret = avfilter_graph_create_filter(&ifilter->filter, buffer_filt, name, args, NULL, fg->graph)) < 0) return ret; + last_filter = ifilter->filter; if (ist->framerate.num) { AVFilterContext *setpts; @@ -446,14 +457,20 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0) + if ((ret = avfilter_link(last_filter, 0, setpts, 0)) < 0) return ret; - first_filter = setpts; - pad_idx = 0; + last_filter = setpts; } - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + snprintf(name, sizeof(name), "trim for input stream %d:%d", + ist->file_index, ist->st->index); + ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + + if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0) return ret; return 0; } @@ -461,19 +478,19 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { - AVFilterContext *first_filter = in->filter_ctx; + AVFilterContext *last_filter; const AVFilter *abuffer_filt = avfilter_get_by_name("abuffer"); InputStream *ist = ifilter->ist; - int pad_idx = in->pad_idx; + InputFile *f = input_files[ist->file_index]; char args[255], name[255]; - int ret; + int ret, pad_idx = 0; snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" ":channel_layout=0x%"PRIx64, - 1, ist->st->codec->sample_rate, - ist->st->codec->sample_rate, - av_get_sample_fmt_name(ist->st->codec->sample_fmt), - ist->st->codec->channel_layout); + 1, ist->dec_ctx->sample_rate, + ist->dec_ctx->sample_rate, + av_get_sample_fmt_name(ist->dec_ctx->sample_fmt), + ist->dec_ctx->channel_layout); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, ist->file_index, ist->st->index); @@ -481,6 +498,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, name, args, NULL, fg->graph)) < 0) return ret; + last_filter = ifilter->filter; if (audio_sync_method > 0) { AVFilterContext *async; @@ -503,12 +521,11 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, if (ret < 0) return ret; - ret = avfilter_link(async, 0, first_filter, pad_idx); + ret = avfilter_link(last_filter, 0, async, 0); if (ret < 0) return ret; - first_filter = async; - pad_idx = 0; + last_filter = async; } if (audio_volume != 256) { AVFilterContext *volume; @@ -526,14 +543,21 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, if (ret < 0) return ret; - ret = avfilter_link(volume, 0, first_filter, pad_idx); + ret = avfilter_link(last_filter, 0, volume, 0); if (ret < 0) return ret; - first_filter = volume; - pad_idx = 0; + last_filter = volume; } - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + + snprintf(name, sizeof(name), "trim for input stream %d:%d", + ist->file_index, ist->st->index); + ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + + if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0) return ret; return 0;