X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=7af247f669f64f7fb022843f9af994a3a6d5887f;hb=a9936a35fbae63311b1132e6283bf28db1d8c233;hp=2d8f83aa73da6d8b03c46005b5c45ff3780da6f7;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 2d8f83aa7..7af247f66 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -21,6 +21,13 @@
  *  @brief A graph of FFmpeg filters.
  */
 
+#include "filter_graph.h"
+#include "filter.h"
+#include "exceptions.h"
+#include "image.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
@@ -28,13 +35,7 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
 }
-#include "decoder.h"
-#include "filter_graph.h"
-#include "filter.h"
-#include "exceptions.h"
-#include "image.h"
-#include "ffmpeg_content.h"
-#include "safe_stringstream.h"
+#include <iostream>
 
 #include "i18n.h"
 
@@ -67,7 +68,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 	}
 
 	_frame = av_frame_alloc ();
-	
+
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
@@ -94,11 +95,11 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 	}
 
 	AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
-	PixelFormat* pixel_fmts = new PixelFormat[2];
+	AVPixelFormat* pixel_fmts = new AVPixelFormat[2];
 	pixel_fmts[0] = _pixel_format;
-	pixel_fmts[1] = PIX_FMT_NONE;
+	pixel_fmts[1] = AV_PIX_FMT_NONE;
 	sink_params->pixel_fmts = pixel_fmts;
-	
+
 	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
 		throw DecodeError (N_("could not create buffer sink."));
 	}
@@ -120,13 +121,10 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 	if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) {
 		throw DecodeError (N_("could not set up filter graph."));
 	}
-	
+
 	if (avfilter_graph_config (graph, 0) < 0) {
 		throw DecodeError (N_("could not configure filter graph."));
 	}
-
-	avfilter_inout_free (&inputs);
-	avfilter_inout_free (&outputs);
 }
 
 FilterGraph::~FilterGraph ()
@@ -147,20 +145,21 @@ FilterGraph::process (AVFrame* frame)
 	if (_copy) {
 		images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
 	} else {
-		if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
-			throw DecodeError (N_("could not push buffer into filter chain."));
+		int r = av_buffersrc_write_frame (_buffer_src_context, frame);
+		if (r < 0) {
+			throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)."), r));
 		}
-		
+
 		while (true) {
 			if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
 				break;
 			}
-			
+
 			images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
 			av_frame_unref (_frame);
 		}
 	}
-		
+
 	return images;
 }