X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=b2a83aad8a48e52e09b3db59159cdc133234a4ff;hb=HEAD;hp=a54ffa0811f8d11850c51426ed43ce43e1dad271;hpb=8611fc8597605aa51373adb4fc8f0c697b8c7360;p=dcpomatic.git diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index a54ffa081..b2a83aad8 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,19 +18,22 @@ */ + /** @file test/ffmpeg_audio_test.cc * @brief Test reading audio from an FFmpeg file. * @ingroup feature */ -#include "lib/ffmpeg_content.h" -#include "lib/film.h" + +#include "lib/constants.h" +#include "lib/content_factory.h" #include "lib/dcp_content_type.h" -#include "lib/video_content.h" -#include "lib/ratio.h" #include "lib/ffmpeg_content.h" -#include "lib/content_factory.h" +#include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/player.h" +#include "lib/ratio.h" +#include "lib/video_content.h" #include "test.h" #include #include @@ -41,25 +44,26 @@ #include #include + +using std::make_shared; using std::string; -using boost::shared_ptr; + BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) { - shared_ptr film = new_test_film ("ffmpeg_audio_test"); + auto film = new_test_film ("ffmpeg_audio_test"); film->set_name ("ffmpeg_audio_test"); - shared_ptr c (new FFmpegContent ("test/data/staircase.mov")); + auto c = make_shared ("test/data/staircase.mov"); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs()); + int constexpr audio_channels = 6; + film->set_container (Ratio::from_id ("185")); - film->set_audio_channels (6); + film->set_audio_channels(audio_channels); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - film->make_dcp (); - film->write_metadata (); - - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); boost::filesystem::path path = "build/test"; path /= "ffmpeg_audio_test"; @@ -67,9 +71,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) dcp::DCP check (path.string ()); check.read (); - shared_ptr sound_asset = check.cpls().front()->reels().front()->main_sound (); + auto sound_asset = check.cpls().front()->reels().front()->main_sound (); BOOST_CHECK (sound_asset); - BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), 6); + BOOST_REQUIRE_EQUAL(sound_asset->asset()->channels (), audio_channels); /* Sample index in the DCP */ int n = 0; @@ -77,74 +81,47 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) int frame = 0; while (n < sound_asset->asset()->intrinsic_duration()) { - shared_ptr sound_frame = sound_asset->asset()->start_read()->get_frame (frame++); + auto sound_frame = sound_asset->asset()->start_read()->get_frame (frame++); uint8_t const * d = sound_frame->data (); - - for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) { - - if (sound_asset->asset()->channels() > 0) { - /* L should be silent */ - int const sample = d[i + 0] | (d[i + 1] << 8); - BOOST_CHECK_EQUAL (sample, 0); - } - - if (sound_asset->asset()->channels() > 1) { - /* R should be silent */ - int const sample = d[i + 2] | (d[i + 3] << 8); - BOOST_CHECK_EQUAL (sample, 0); - } - - if (sound_asset->asset()->channels() > 2) { - /* Mono input so it will appear on centre */ - int const sample = d[i + 7] | (d[i + 8] << 8); - BOOST_CHECK_EQUAL (sample, n); - } - - if (sound_asset->asset()->channels() > 3) { - /* Lfe should be silent */ - int const sample = d[i + 9] | (d[i + 10] << 8); - BOOST_CHECK_EQUAL (sample, 0); + for (int offset = 0; offset < sound_frame->size(); offset += (3 * sound_asset->asset()->channels())) { + for (auto channel = 0; channel < audio_channels; ++channel) { + auto const sample = d[offset + channel * 3 + 1] | (d[offset + channel * 3 + 2] << 8); + if (channel == 2) { + /* Input should be on centre */ + BOOST_CHECK_EQUAL(sample, n); + } else { + /* Everything else should be silent */ + BOOST_CHECK_EQUAL(sample, 0); + } } - - if (sound_asset->asset()->channels() > 4) { - /* Ls should be silent */ - int const sample = d[i + 11] | (d[i + 12] << 8); - BOOST_CHECK_EQUAL (sample, 0); - } - - - if (sound_asset->asset()->channels() > 5) { - /* Rs should be silent */ - int const sample = d[i + 13] | (d[i + 14] << 8); - BOOST_CHECK_EQUAL (sample, 0); - } - ++n; } } } + /** Decode a file containing truehd so we can profile it; this is with the player set to normal */ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2) { - shared_ptr film = new_test_film2 ("ffmpeg_audio_test2"); - shared_ptr content = content_factory(TestPaths::private_data() / "wayne.mkv").front(); + auto film = new_test_film2 ("ffmpeg_audio_test2"); + auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); while (!player->pass ()) {} } + /** Decode a file containing truehd so we can profile it; this is with the player set to fast */ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3) { - shared_ptr film = new_test_film2 ("ffmpeg_audio_test3"); - shared_ptr content = content_factory(TestPaths::private_data() / "wayne.mkv").front(); + auto film = new_test_film2 ("ffmpeg_audio_test3"); + auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); player->set_fast (); while (!player->pass ()) {} } @@ -153,12 +130,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3) /** Decode a file whose audio previously crashed DCP-o-matic (#1857) */ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4) { - shared_ptr film = new_test_film2 ("ffmpeg_audio_test4"); - shared_ptr content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv").front(); + auto film = new_test_film2 ("ffmpeg_audio_test4"); + auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); player->set_fast (); BOOST_CHECK_NO_THROW (while (!player->pass()) {}); }