X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_examiner_test.cc;h=655fd1437be76c52f8acf050ebea14de96fe2194;hb=d2929a5dea6639f1896fb69929a4913e3d4f4fb5;hp=04e6f25356a53174e1c52f99fba3c83c6cd717aa;hpb=5d937606cf96d163be98920fa5619114a28eec9d;p=dcpomatic.git

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 04e6f2535..655fd1437 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,46 +18,52 @@
 
 */
 
+
 /** @file  test/ffmpeg_examiner_test.cc
  *  @brief FFmpegExaminer tests
- *  @ingroup specific
+ *  @ingroup selfcontained
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/ffmpeg_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "test.h"
 
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
 using namespace dcpomatic;
 
+
 /** Check that the FFmpegExaminer can extract the first video and audio time
  *  correctly from data/count300bd24.m2ts.
  */
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_examiner_test");
-	shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/count300bd24.m2ts"));
-	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
+	auto film = new_test_film ("ffmpeg_examiner_test");
+	auto content = make_shared<FFmpegContent>("test/data/count300bd24.m2ts");
+	auto examiner = make_shared<FFmpegExaminer>(content);
 
 	BOOST_CHECK_EQUAL (examiner->first_video().get().get(), ContentTime::from_seconds(600).get());
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1U);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get().get(), ContentTime::from_seconds(600).get());
 }
 
+
 /** Check that audio sampling rate and channel counts are correctly picked up from
  *  a problematic file.  When we used to specify analyzeduration and probesize
  *  this file's details were picked up incorrectly.
  */
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_probesize_test)
 {
-	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "RockyTop10 Playlist Flat.m4v"));
-	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer(content));
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "RockyTop10 Playlist Flat.m4v");
+	auto examiner = make_shared<FFmpegExaminer>(content);
 
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 2U);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->frame_rate(), 48000);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->channels(), 2);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->frame_rate(), 48000);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->channels(), 6);
+	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->channels(), 5);
 }