X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_examiner_test.cc;h=9dfb0f3dce679f1fd78fd1ef3e3d6fa2d1d00e02;hp=9c3311719ea0d5c73d316e0d7ee4479b6591b050;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 9c3311719..9dfb0f3dc 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,79 @@
 
 */
 
+
 /** @file  test/ffmpeg_examiner_test.cc
  *  @brief FFmpegExaminer tests
  *  @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 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);
+}
+
+
+/** Check that a file can be examined without error */
+BOOST_AUTO_TEST_CASE (ffmpeg_examiner_vob_test)
+{
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "bad.vob");
+	auto examiner = make_shared<FFmpegExaminer>(content);
+}
+
+
+/** Check that another file can be examined without error */
+BOOST_AUTO_TEST_CASE (ffmpeg_examiner_mkv_test)
+{
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "sample.mkv");
+	auto examiner = make_shared<FFmpegExaminer>(content);
+}
+
+
+/** Check that the video stream is correctly picked from a difficult file (#2238) */
+BOOST_AUTO_TEST_CASE (ffmpeg_examiner_video_stream_selection_test)
+{
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "isy.mp4");
+	auto examiner = make_shared<FFmpegExaminer>(content);
+
+	BOOST_REQUIRE (examiner->video_frame_rate());
+	BOOST_CHECK_EQUAL (examiner->video_frame_rate().get(), 25);
 }