Revert "Use make_shared<>."

[dcpomatic.git] / test / ffmpeg_decoder_sequential_test.cc

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 03bf9e2ce3adfe0de8e4de5df599e05e402577ce..6a27d698f5713997c0c0fd4d7e68caec77e8831c 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -25,6 +26,8 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
 #include "lib/null_log.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
@@ -37,8 +40,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-static void
-test (boost::filesystem::path file, float fps, int gaps, int video_length)
+void
+ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length)
 {
        boost::filesystem::path path = private_data / file;
        if (!boost::filesystem::exists (path)) {
@@ -53,28 +56,29 @@ test (boost::filesystem::path file, float fps, int gaps, int video_length)
        shared_ptr<Log> log (new NullLog);
        shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-       BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
+       BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
+       BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);
 
 #ifdef DCPOMATIC_DEBUG
-       decoder->test_gaps = 0;
+       decoder->video->test_gaps = 0;
 #endif
        for (Frame i = 0; i < video_length; ++i) {
                list<ContentVideo> v;
-               v = decoder->get_video (i, true);
+               v = decoder->video->get (i, true);
                BOOST_REQUIRE_EQUAL (v.size(), 1U);
-               BOOST_CHECK_EQUAL (v.front().frame, i);
+               BOOST_CHECK_EQUAL (v.front().frame.index(), i);
        }
 #ifdef DCPOMATIC_DEBUG
-       BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
+       BOOST_CHECK_EQUAL (decoder->video->test_gaps, gaps);
 #endif
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
-       test ("boon_telly.mkv", 29.97, 0, 6910);
-       test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
+       ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 0, 6910);
+       ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
        /* The first video frame is 12 here, so VideoDecoder should see 12 gaps
           (at the start of the file)
        */
-       test ("prophet_clip.mkv", 23.976, 12, 2875);
+       ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 12, 2875);
 }