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

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index e297d0cd2..67bfda3e5 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -18,52 +18,58 @@
 
 */
 
-#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 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;
-	locked_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>"
 		"<BitsPerPixel>12</BitsPerPixel>"
-		"<LeftCrop>" << crop.left << "</LeftCrop>"
-		"<RightCrop>" << crop.right << "</RightCrop>"
-		"<TopCrop>" << crop.top << "</TopCrop>"
-		"<BottomCrop>" << crop.bottom << "</BottomCrop>"
+		"<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>"
@@ -87,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<FFmpegContent> vc (new FFmpegContent (film, doc, 10, notes));
+	shared_ptr<FFmpegContent> vc (new FFmpegContent (doc, 10, notes));
 
 	optional<VideoContentScale> sc;
 	if (ratio) {