X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=5add16d19bcedac612b55eecf5bc85a7feedf99a;hb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;hp=2624bc4d7c0354a9bf46a48348a6c75d38dd5872;hpb=fdd63a4c9925f0339089dce3a52f0d6ed0d97880;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 2624bc4d7..5add16d19 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -33,36 +33,38 @@ extern "C" {
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
-#include "film.h"
-#include "ffmpeg_decoder.h"
+#include "ffmpeg_content.h"
 
 #include "i18n.h"
 
 using std::stringstream;
 using std::string;
 using std::list;
+using std::pair;
+using std::make_pair;
+using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
+using boost::weak_ptr;
+using dcp::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> film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p)
+FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::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;
-	if (!filters.empty ()) {
-		filters += N_(",");
+	_frame = av_frame_alloc ();
+	
+	string filters = Filter::ffmpeg_string (content->filters());
+	if (filters.empty ()) {
+		filters = "copy";
 	}
 
-	filters += crop_string (Position (film->crop().left, film->crop().top), film->cropped_size (decoder->native_size()));
-
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
@@ -81,12 +83,10 @@ FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
 	stringstream a;
 	a << "video_size=" << _size.width << "x" << _size.height << ":"
 	  << "pix_fmt=" << _pixel_format << ":"
-	  << "time_base=" << decoder->time_base_numerator() << "/" << decoder->time_base_denominator() << ":"
-	  << "pixel_aspect=" << decoder->sample_aspect_ratio_numerator() << "/" << decoder->sample_aspect_ratio_denominator();
-
-	int r;
+	  << "time_base=1/1:"
+	  << "pixel_aspect=1/1";
 
-	if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) {
+	if (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"));
 	}
 
@@ -122,30 +122,34 @@ FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
 		throw DecodeError (N_("could not configure filter graph."));
 	}
 
-	/* XXX: leaking `inputs' / `outputs' ? */
+	avfilter_inout_free (&inputs);
+	avfilter_inout_free (&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<shared_ptr<Image> >
+list<pair<shared_ptr<Image>, int64_t> >
 FilterGraph::process (AVFrame* frame)
 {
-	list<shared_ptr<Image> > images;
+	list<pair<shared_ptr<Image>, int64_t> > images;
 
 	if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
 		throw DecodeError (N_("could not push buffer into filter chain."));
 	}
 
 	while (1) {
-		AVFrame* frame = av_frame_alloc ();
-		if (av_buffersink_get_frame (_buffer_sink_context, frame) < 0) {
-			av_frame_free (&frame);
+		if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
 			break;
 		}
 
-		/* This takes ownership of the AVFrame */
-		images.push_back (shared_ptr<Image> (new FrameImage (frame, true)));
+		images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
+		av_frame_unref (_frame);
 	}
 	
 	return images;
@@ -156,7 +160,7 @@ FilterGraph::process (AVFrame* frame)
  *  @return true if this chain can process images with `s' and `p', otherwise false.
  */
 bool
-FilterGraph::can_process (libdcp::Size s, AVPixelFormat p) const
+FilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
 {
 	return (_size == s && _pixel_format == p);
 }