Use make_shared<>.

[dcpomatic.git] / test / video_content_scale_test.cc

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index 80367274dc4c2288ecfc6f936828747d4b8ee212..f1edce04150fb1997fe1fc622d8a535761d9e532 100644 (file)
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -1,31 +1,34 @@
 /*
     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>
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
 
 using std::list;
 using std::string;
 using std::cerr;
-using std::stringstream;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::optional;
 
 static
@@ -33,7 +36,7 @@ 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;
+       SafeStringStream s;
        s << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                "<Content>"
                "<Type>FFmpeg</Type>"
@@ -49,6 +52,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
                "<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>"
@@ -84,11 +88,11 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
                "<SubtitleYScale>0</SubtitleYScale>"
                "</Content>";
 
-       shared_ptr<cxml::Document> doc (new cxml::Document ());
+       shared_ptr<cxml::Document> doc = make_shared<cxml::Document> ();
        doc->read_string(s.str ());
 
        list<string> notes;
-       shared_ptr<VideoContent> vc (new FFmpegContent (film, doc, 10, notes));
+       shared_ptr<FFmpegContent> vc = boost::make_shared<FFmpegContent> (film, doc, 10, notes);
 
        optional<VideoContentScale> sc;
        if (ratio) {
@@ -97,9 +101,9 @@ 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";
        }