X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_filter_graph.cc;h=6075500e9d9148f5af103e9f56f6034dbdc3ab58;hb=2d5c6f23650ae3a912badc8b059c83d40c61a0fa;hp=8aef4fb006db1a0fd30c0967971a8d0c61d10443;hpb=419afb743ad2aaf1ea301356ac09f9a26ee15567;p=dcpomatic.git

diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc
index 8aef4fb00..6075500e9 100644
--- a/src/lib/video_filter_graph.cc
+++ b/src/lib/video_filter_graph.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -34,9 +35,10 @@ using std::string;
 using std::make_pair;
 using boost::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)
 {
 
 }
@@ -83,14 +85,15 @@ 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;
 }
 
 void *
@@ -98,7 +101,6 @@ VideoFilterGraph::sink_parameters () const
 {
 	AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
 	AVPixelFormat* pixel_fmts = new AVPixelFormat[2];
-	pixel_fmts = new AVPixelFormat[2];
 	pixel_fmts[0] = _pixel_format;
 	pixel_fmts[1] = AV_PIX_FMT_NONE;
 	sink_params->pixel_fmts = pixel_fmts;
@@ -116,4 +118,3 @@ VideoFilterGraph::sink_name () const
 {
 	return "buffersink";
 }
-