X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=4564033d5379dd5d6770addfdac826cff447237f;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=a52c030fe549d475be012dbbf7788b2764f5d25d;hpb=5859b758e3a6e0191ce12e77b636c7def58bbc3b;p=dcpomatic.git diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index a52c030fe..4564033d5 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -23,24 +23,16 @@ extern "C" { #include -#ifdef HAVE_BUFFERSRC_H #include -#endif -#if (LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 77) || LIBAVFILTER_VERSION_MAJOR == 3 #include #include -#elif LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 -#include -#endif #include } #include "decoder.h" #include "filter_graph.h" -#include "ffmpeg_compatibility.h" #include "filter.h" #include "exceptions.h" #include "image.h" -#include "film.h" #include "ffmpeg_decoder.h" #include "i18n.h" @@ -49,26 +41,32 @@ using std::stringstream; using std::string; using std::list; using boost::shared_ptr; +using boost::weak_ptr; using libdcp::Size; -/** Construct a FilterGraph for the settings in a film. - * @param film Film. - * @param decoder Decoder that we are using. +/** Construct a FilterGraph for the settings in a piece of content. + * @param content Content. * @param s Size of the images to process. * @param p Pixel format of the images to process. */ -FilterGraph::FilterGraph (shared_ptr film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p) +FilterGraph::FilterGraph (shared_ptr content, libdcp::Size s, AVPixelFormat p) : _buffer_src_context (0) , _buffer_sink_context (0) , _size (s) , _pixel_format (p) { - string filters = Filter::ffmpeg_strings (film->filters()).first; + _frame = av_frame_alloc (); + + string filters = Filter::ffmpeg_strings (content->filters()).first; if (!filters.empty ()) { - filters += N_(","); + filters += ","; } - filters += crop_string (Position (film->crop().left, film->crop().top), film->cropped_size (decoder->native_size())); + Crop crop = content->crop (); + libdcp::Size cropped_size = _size; + cropped_size.width -= crop.left + crop.right; + cropped_size.height -= crop.top + crop.bottom; + filters += crop_string (Position (crop.left, crop.top), cropped_size); AVFilterGraph* graph = avfilter_graph_alloc(); if (graph == 0) { @@ -80,20 +78,20 @@ FilterGraph::FilterGraph (shared_ptr film, FFmpegDecoder* decoder, l throw DecodeError (N_("could not find buffer src filter")); } - AVFilter* buffer_sink = get_sink (); + AVFilter* buffer_sink = avfilter_get_by_name(N_("buffersink")); + if (buffer_sink == 0) { + throw DecodeError (N_("Could not create buffer sink filter")); + } stringstream a; - a << _size.width << N_(":") - << _size.height << N_(":") - << _pixel_format << N_(":") - << decoder->time_base_numerator() << N_(":") - << decoder->time_base_denominator() << N_(":") - << decoder->sample_aspect_ratio_numerator() << N_(":") - << decoder->sample_aspect_ratio_denominator(); + a << "video_size=" << _size.width << "x" << _size.height << ":" + << "pix_fmt=" << _pixel_format << ":" + << "time_base=0/1:" + << "pixel_aspect=0/1"; int r; - if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, N_("in"), a.str().c_str(), 0, graph)) < 0) { + if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) { throw DecodeError (N_("could not create buffer source")); } @@ -107,6 +105,8 @@ FilterGraph::FilterGraph (shared_ptr film, FFmpegDecoder* decoder, l throw DecodeError (N_("could not create buffer sink.")); } + av_free (sink_params); + AVFilterInOut* outputs = avfilter_inout_alloc (); outputs->name = av_strdup(N_("in")); outputs->filter_ctx = _buffer_src_context; @@ -119,15 +119,9 @@ FilterGraph::FilterGraph (shared_ptr film, FFmpegDecoder* decoder, l inputs->pad_idx = 0; inputs->next = 0; -#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 - if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) { - throw DecodeError (N_("could not set up filter graph.")); - } -#else if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) { throw DecodeError (N_("could not set up filter graph.")); } -#endif if (avfilter_graph_config (graph, 0) < 0) { throw DecodeError (N_("could not configure filter graph.")); @@ -136,66 +130,29 @@ FilterGraph::FilterGraph (shared_ptr film, FFmpegDecoder* decoder, l /* XXX: leaking `inputs' / `outputs' ? */ } +FilterGraph::~FilterGraph () +{ + av_frame_free (&_frame); +} + /** Take an AVFrame and process it using our configured filters, returning a - * set of Images. + * set of Images. Caller handles memory management of the input frame. */ list > -FilterGraph::process (AVFrame const * frame) +FilterGraph::process (AVFrame* frame) { list > images; - -#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 61 - - if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0) < 0) { - throw DecodeError (N_("could not push buffer into filter chain.")); - } - -#elif LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 - - AVRational par; - par.num = sample_aspect_ratio_numerator (); - par.den = sample_aspect_ratio_denominator (); - - if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0, par) < 0) { - throw DecodeError (N_("could not push buffer into filter chain.")); - } - -#else if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) { throw DecodeError (N_("could not push buffer into filter chain.")); } -#endif - -#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 15 && LIBAVFILTER_VERSION_MINOR <= 61 - while (avfilter_poll_frame (_buffer_sink_context->inputs[0])) { -#else - while (av_buffersink_read (_buffer_sink_context, 0)) { -#endif - -#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 15 - - int r = avfilter_request_frame (_buffer_sink_context->inputs[0]); - if (r < 0) { - throw DecodeError (N_("could not request filtered frame")); - } - - AVFilterBufferRef* filter_buffer = _buffer_sink_context->inputs[0]->cur_buf; - -#else - - AVFilterBufferRef* filter_buffer; - if (av_buffersink_get_buffer_ref (_buffer_sink_context, &filter_buffer, 0) < 0) { - filter_buffer = 0; + while (1) { + if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) { + break; } -#endif - - if (filter_buffer) { - /* This takes ownership of filter_buffer */ - images.push_back (shared_ptr (new FilterBufferImage ((PixelFormat) frame->format, filter_buffer))); - } + images.push_back (shared_ptr (new SimpleImage (_frame))); } return images;