Remove our forcing of analyzeduration and probesize as they seem to

[dcpomatic.git] / test / ffmpeg_examiner_test.cc

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 2900689e52a539d549acf780ee1d966abbe41f36..14953fdbb446453d25667a1ca5c3fe6ee1492bae 100644 (file)
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -19,27 +19,44 @@
 */
 
 /** @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>
 #include "lib/ffmpeg_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
 
+/** 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 = make_shared<FFmpegContent> (film, "test/data/count300bd24.m2ts");
-       shared_ptr<FFmpegExaminer> examiner = make_shared<FFmpegExaminer> (content);
+       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);
 }