X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilter_graph.cc;h=a3bb0093edb1e7a84896d8286b04840962f246d4;hb=44555d6be9043c00030050caf9b49cd0241730c9;hp=b13b232a9a0a5c8405fb9b8d1835120b91a654bb;hpb=4699463e19b2a153d64aeb0e00c62be1157bfc1b;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index b13b232a9..a3bb0093e 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -33,13 +33,14 @@ extern "C" {
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
-#include "ffmpeg_decoder.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 boost::weak_ptr;
@@ -59,13 +60,10 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 	_frame = av_frame_alloc ();
 	
 	string filters = Filter::ffmpeg_strings (content->filters()).first;
-	if (!filters.empty ()) {
-		filters += ",";
+	if (filters.empty ()) {
+		filters = "copy";
 	}
 
-	/* XXX; remove */
-	filters += crop_string (Position (), _size);
-
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
@@ -87,9 +85,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 	  << "time_base=1/1:"
 	  << "pixel_aspect=1/1";
 
-	int r;
-
-	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"));
 	}
 
@@ -136,10 +132,10 @@ FilterGraph::~FilterGraph ()
 /** Take an AVFrame and process it using our configured filters, returning a
  *  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."));
@@ -150,7 +146,7 @@ FilterGraph::process (AVFrame* frame)
 			break;
 		}
 
-		images.push_back (shared_ptr<Image> (new SimpleImage (_frame)));
+		images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
 		av_frame_unref (_frame);
 	}