X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_examiner_test.cc;h=14953fdbb446453d25667a1ca5c3fe6ee1492bae;hp=26834aafc8d7512b304ae24488d3d013893c8d3b;hb=715d87a4cf9e4697a2f67881776c19c4ce8af581;hpb=e80e6a8567dd107f5ea3b708975cb5fd92112a57

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 26834aafc..14953fdbb 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -1,25 +1,26 @@
 /*
     Copyright (C) 2013-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/>.
 
 */
 
 /** @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,13 +31,32 @@
 
 using boost::shared_ptr;
 
+/** 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->audio_streams().size(), 1);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.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().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);
 }