X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_examiner_test.cc;h=f8453ddb57b68197d335587a3149c2f64883c14a;hb=d291ce8580aabc2e4340c9887ea1733325bb1b80;hp=13846a8a16bff016609efa9a85357e8b7b5d8fb5;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 13846a8a1..f8453ddb5 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -19,8 +19,8 @@
 */
 
 /** @file  test/ffmpeg_examiner_test.cc
- *  @brief Check that the FFmpegExaminer can extract the first video and audio time
- *  correctly from data/count300bd24.m2ts.
+ *  @brief FFmpegExaminer tests
+ *  @ingroup specific
  */
 
 #include <boost/test/unit_test.hpp>
@@ -30,14 +30,34 @@
 #include "test.h"
 
 using boost::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 (film, "test/data/count300bd24.m2ts"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/count300bd24.m2ts"));
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
 
-	BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime::from_seconds (600));
+	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(), ContentTime::from_seconds (600));
+	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(private_data / "RockyTop10 Playlist Flat.m4v"));
+	shared_ptr<FFmpegExaminer> examiner (new 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);
 }