X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_filter_graph.cc;h=b35fc14c11897b9edcde688859f15df37a482054;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=306a17a5d84a33d891c3c8be465edf828521d921;hpb=b147c77c6d44399ad522298ac52a481fe5988287;p=dcpomatic.git

diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc
index 306a17a5d..b35fc14c1 100644
--- a/src/lib/video_filter_graph.cc
+++ b/src/lib/video_filter_graph.cc
@@ -1,25 +1,27 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "video_filter_graph.h"
-#include "image.h"
 #include "compose.hpp"
+#include "image.h"
+#include "video_filter_graph.h"
+#include "warnings.h"
 extern "C" {
 #include <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>
@@ -32,11 +34,12 @@ using std::pair;
 using std::vector;
 using std::string;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 
-VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p)
+VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r)
 	: _size (s)
 	, _pixel_format (p)
+	, _frame_rate (r)
 {
 
 }
@@ -49,6 +52,7 @@ VideoFilterGraph::process (AVFrame* frame)
 {
 	list<pair<shared_ptr<Image>, int64_t> > images;
 
+DCPOMATIC_DISABLE_WARNINGS
 	if (_copy) {
 		images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
 	} else {
@@ -66,6 +70,7 @@ VideoFilterGraph::process (AVFrame* frame)
 			av_frame_unref (_frame);
 		}
 	}
+DCPOMATIC_ENABLE_WARNINGS
 
 	return images;
 }
@@ -83,17 +88,18 @@ VideoFilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
 string
 VideoFilterGraph::src_parameters () const
 {
-	SafeStringStream a;
-
-	a << "video_size=" << _size.width << "x" << _size.height << ":"
-	  << "pix_fmt=" << _pixel_format << ":"
-	  << "time_base=1/1:"
-	  << "pixel_aspect=1/1";
-
-	return a.str ();
+	char buffer[256];
+	snprintf (
+		buffer, sizeof(buffer),
+		"video_size=%dx%d:pix_fmt=%d:frame_rate=%d/%d:time_base=1/1:pixel_aspect=1/1",
+		_size.width, _size.height,
+		_pixel_format,
+		_frame_rate.numerator, _frame_rate.denominator
+		);
+	return buffer;
 }
 
-AVBufferSinkParams *
+void *
 VideoFilterGraph::sink_parameters () const
 {
 	AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
@@ -103,3 +109,15 @@ VideoFilterGraph::sink_parameters () const
 	sink_params->pixel_fmts = pixel_fmts;
 	return sink_params;
 }
+
+string
+VideoFilterGraph::src_name () const
+{
+	return "buffer";
+}
+
+string
+VideoFilterGraph::sink_name () const
+{
+	return "buffersink";
+}