From 715d87a4cf9e4697a2f67881776c19c4ce8af581 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2019 22:56:49 +0000 Subject: Remove our forcing of analyzeduration and probesize as they seem to cause weird problems when scanning some files. The unit test case added here is a case in point: before this patch one stream reported an incorrect channel count and sample rate. It's a bit worrying as these parameters have been in DoM for many years, but perhaps they have become unnecessary / harmful with changes to FFmpeg. --- test/ffmpeg_examiner_test.cc | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'test/ffmpeg_examiner_test.cc') diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index d4614e226..14953fdbb 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -19,8 +19,7 @@ */ /** @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 */ @@ -32,6 +31,9 @@ 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 = new_test_film ("ffmpeg_examiner_test"); @@ -42,3 +44,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test) 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 content (new FFmpegContent(private_data / "RockyTop10 Playlist Flat.m4v")); + shared_ptr 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); +} -- cgit v1.2.3