X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_only_test.cc;h=40c909b394b549d89d0694f0a2e0878c5a55a743;hb=0c846af54055b9915c6c68617cd28176d5f84351;hp=6fc9f9f2cda58f03a5beef38abaed9edc115589b;hpb=990f879d9af6300068af44c431b1a8e158e7f7a0;p=dcpomatic.git diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index 6fc9f9f2c..40c909b39 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,13 @@ */ + /** @file test/ffmpeg_audio_only_test.cc * @brief Test FFmpeg content with audio but no video. - * @ingroup specific + * @ingroup feature */ + #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" @@ -36,15 +38,22 @@ #include #include + using std::min; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -static SNDFILE* ref = 0; + +static SNDFILE* ref = nullptr; static int ref_buffer_size = 0; -static float* ref_buffer = 0; +static float* ref_buffer = nullptr; + static void -audio (boost::shared_ptr audio, int channels) +audio (std::shared_ptr audio, int channels) { /* Check that we have a big enough buffer */ BOOST_CHECK (audio->frames() * audio->channels() < ref_buffer_size); @@ -65,21 +74,21 @@ audio (boost::shared_ptr audio, int channels) } } + /** Test the FFmpeg code with audio-only content */ static shared_ptr test (boost::filesystem::path file) { - shared_ptr film = new_test_film ("ffmpeg_audio_only_test"); + auto film = new_test_film ("ffmpeg_audio_only_test"); film->set_name ("test_film"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); - shared_ptr c (new FFmpegContent(file)); + auto c = make_shared(file); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs()); film->write_metadata (); /* See if can make a DCP without any errors */ - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA}); BOOST_CHECK (!JobManager::instance()->errors()); /* Compare the audio data player reads with what libsndfile reads */ @@ -92,7 +101,7 @@ test (boost::filesystem::path file) ref_buffer_size = info.samplerate * info.channels; ref_buffer = new float[ref_buffer_size]; - shared_ptr player (new Player(film)); + auto player = make_shared(film, Image::Alignment::COMPACT); player->Audio.connect (bind (&audio, _1, info.channels)); while (!player->pass ()) {} @@ -103,10 +112,11 @@ test (boost::filesystem::path file) return film; } + BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) { /* S16 */ - shared_ptr film = test ("test/data/staircase.wav"); + auto film = test ("test/data/staircase.wav"); /* Compare the audio data in the DCP with what libsndfile reads */ @@ -116,12 +126,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - int16_t* buffer = new int16_t[info.channels * 2000]; + auto buffer = new int16_t[info.channels * 2000]; dcp::SoundAsset asset (dcp_file(film, "pcm")); - shared_ptr reader = asset.start_read (); + auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { - shared_ptr frame = reader->get_frame(i); + auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_short (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) { @@ -133,10 +143,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) delete[] buffer; } + BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) { /* S32 1 channel */ - shared_ptr film = test ("test/data/sine_440.wav"); + auto film = test ("test/data/sine_440.wav"); /* Compare the audio data in the DCP with what libsndfile reads */ @@ -146,12 +157,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - int32_t* buffer = new int32_t[info.channels * 2000]; + auto buffer = new int32_t[info.channels * 2000]; dcp::SoundAsset asset (dcp_file(film, "pcm")); - shared_ptr reader = asset.start_read (); + auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { - shared_ptr frame = reader->get_frame(i); + auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_int (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) { @@ -167,10 +178,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) delete[] buffer; } + BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) { /* S24 1 channel */ - shared_ptr film = test ("test/data/sine_24_48_440.wav"); + auto film = test ("test/data/sine_24_48_440.wav"); /* Compare the audio data in the DCP with what libsndfile reads */ @@ -180,12 +192,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - int32_t* buffer = new int32_t[info.channels * 2000]; + auto buffer = new int32_t[info.channels * 2000]; dcp::SoundAsset asset (dcp_file(film, "pcm")); - shared_ptr reader = asset.start_read (); + auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { - shared_ptr frame = reader->get_frame(i); + auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_int (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) {