X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvideo_content_scale_test.cc;h=67bfda3e5afae3f6e2f6c81a091b949d53ac6f8e;hp=d2ee4c0d83c8408b0b98eaf9e2be744279a7668f;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=ae15eeca8588c6928d7671894db98c2e289fa601

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index d2ee4c0d8..67bfda3e5 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -1,67 +1,75 @@
 /*
     Copyright (C) 2015 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 <boost/test/unit_test.hpp>
+/** @file  test/video_content_scale_test.cc
+ *  @brief Test VideoContentScale
+ *  @ingroup selfcontained
+ */
+
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
+#include <dcp/raw_convert.h>
+#include <boost/test/unit_test.hpp>
 
 using std::list;
 using std::string;
 using std::cerr;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::optional;
+using dcp::raw_convert;
 
 static
 void
 test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop crop, Ratio const * ratio, bool scale, dcp::Size correct)
 {
 	shared_ptr<Film> film;
-	stringstream s;
-	s << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+	string s = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
 		"<Content>"
 		"<Type>FFmpeg</Type>"
-		"<Path>/home/c.hetherington/DCP/prophet_clip.mkv</Path>"
+		"<Path>/home/c.hetherington/DCP/prophet_long_clip.mkv</Path>"
 		"<Digest>f3f23663da5bef6d2cbaa0db066f3351314142710</Digest>"
 		"<Position>0</Position>"
 		"<TrimStart>0</TrimStart>"
 		"<TrimEnd>0</TrimEnd>"
 		"<VideoLength>2879</VideoLength>"
-		"<VideoWidth>" << content_size.width << "</VideoWidth>"
-		"<VideoHeight>" << content_size.height << "</VideoHeight>"
+		"<VideoWidth>" + raw_convert<string>(content_size.width) + "</VideoWidth>"
+		"<VideoHeight>" + raw_convert<string>(content_size.height) + "</VideoHeight>"
 		"<VideoFrameRate>23.97602462768555</VideoFrameRate>"
 		"<OriginalVideoFrameRate>23.97602462768555</OriginalVideoFrameRate>"
 		"<VideoFrameType>0</VideoFrameType>"
 		"<SampleAspectRatio>1</SampleAspectRatio>"
-		"<LeftCrop>" << crop.left << "</LeftCrop>"
-		"<RightCrop>" << crop.right << "</RightCrop>"
-		"<TopCrop>" << crop.top << "</TopCrop>"
-		"<BottomCrop>" << crop.bottom << "</BottomCrop>"
+		"<BitsPerPixel>12</BitsPerPixel>"
+		"<LeftCrop>" + raw_convert<string>(crop.left) + "</LeftCrop>"
+		"<RightCrop>" + raw_convert<string>(crop.right) + "</RightCrop>"
+		"<TopCrop>" + raw_convert<string>(crop.top) + "</TopCrop>"
+		"<BottomCrop>" + raw_convert<string>(crop.bottom) + "</BottomCrop>"
 		"<Scale>";
 
 	if (ratio) {
-		s << "<Ratio>" << ratio->id() << "</Ratio>";
+		s += "<Ratio>" + ratio->id() + "</Ratio>";
 	} else {
-		s << "<Scale>" << scale << "</Scale>";
+		s += "<Scale>" + string(scale ? "1" : "0") + "</Scale>";
 	}
 
-	s << "</Scale>"
+	s += "</Scale>"
 		"<ColourConversion>"
 		"<InputGamma>2.4</InputGamma>"
 		"<InputGammaLinearised>1</InputGammaLinearised>"
@@ -85,10 +93,10 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
 		"</Content>";
 
 	shared_ptr<cxml::Document> doc (new cxml::Document ());
-	doc->read_string(s.str ());
+	doc->read_string (s);
 
 	list<string> notes;
-	shared_ptr<VideoContent> vc (new FFmpegContent (film, doc, 10, notes));
+	shared_ptr<FFmpegContent> vc (new FFmpegContent (doc, 10, notes));
 
 	optional<VideoContentScale> sc;
 	if (ratio) {
@@ -97,15 +105,15 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
 		sc = VideoContentScale (scale);
 	}
 
-	dcp::Size answer = sc.get().size (vc, display_size, film_size);
+	dcp::Size answer = sc.get().size (vc->video, display_size, film_size);
 	if (answer != correct) {
-		cerr << "Testing " << vc->video_size().width << "x" << vc->video_size().height << "\n";
+		cerr << "Testing " << vc->video->size().width << "x" << vc->video->size().height << "\n";
 		cerr << "Testing " << display_size.width << "x" << display_size.height << "\n";
 		cerr << answer.width << "x" << answer.height << " instead of " << correct.width << "x" << correct.height << "\n";
 	}
 	BOOST_CHECK (answer == correct);
 }
-      
+
 /* Test scale and stretch to specified ratio */
 BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
 {
@@ -132,7 +140,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
 		true,
 		dcp::Size (1998, 837)
 		);
-	
+
 	// Flat in scope container
 	test (
 		dcp::Size (400, 200),
@@ -144,7 +152,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
 		dcp::Size (1587, 858)
 		);
 
-	
+
 	/* To player */
 
 	// Flat in flat container
@@ -168,7 +176,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
 		true,
 		dcp::Size (185, 78)
 		);
-	
+
 	// Flat in scope container
 	test (
 		dcp::Size (400, 200),