X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_audio_only_test.cc;h=ea9a9c4e54161d18c12616579ad06fcdacd63c52;hp=a7e2ca02548181d81eca3e6f7330f723fefd1b6a;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=639fd201ac8c94b76ee686b07bcc8ec3f1e83da7 diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index a7e2ca025..ea9a9c4e5 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,13 @@ */ + +/** @file test/ffmpeg_audio_only_test.cc + * @brief Test FFmpeg content with audio but no video. + * @ingroup feature + */ + + #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" @@ -25,22 +32,32 @@ #include "lib/job_manager.h" #include "lib/audio_buffers.h" #include "test.h" +#include +#include #include #include +#include + + +using std::min; +using std::shared_ptr; +using std::make_shared; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + -using boost::shared_ptr; +static SNDFILE* ref = nullptr; +static std::vector ref_buffer; -static SNDFILE* ref = 0; -static int ref_buffer_size = 0; -static float* ref_buffer = 0; 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); + BOOST_CHECK (audio->frames() * audio->channels() < static_cast(ref_buffer.size())); - int const N = sf_readf_float (ref, ref_buffer, audio->frames()); + int const N = sf_readf_float (ref, ref_buffer.data(), audio->frames()); for (int i = 0; i < N; ++i) { switch (channels) { case 1: @@ -56,49 +73,133 @@ audio (boost::shared_ptr audio, int channels) } } + /** Test the FFmpeg code with audio-only content */ -static void +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 (film, file)); + auto c = make_shared(file); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->write_metadata (); /* See if can make a DCP without any errors */ - film->make_dcp (); - wait_for_jobs (); + make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA}); BOOST_CHECK (!JobManager::instance()->errors()); - /* Compare the audio data we read with what libsndfile reads */ + /* Compare the audio data player reads with what libsndfile reads */ SF_INFO info; info.format = 0; ref = sf_open (file.string().c_str(), SFM_READ, &info); /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - ref_buffer_size = info.samplerate * info.channels; - ref_buffer = new float[ref_buffer_size]; + ref_buffer.resize(info.samplerate * info.channels); - shared_ptr player (new Player (film, film->playlist ())); + auto player = make_shared(film, Image::Alignment::COMPACT); player->Audio.connect (bind (&audio, _1, info.channels)); while (!player->pass ()) {} sf_close (ref); + + return film; } + BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) { /* S16 */ - test ("test/data/staircase.wav"); + auto film = test ("test/data/staircase.wav"); + + /* Compare the audio data in the DCP with what libsndfile reads */ + + SF_INFO info; + info.format = 0; + ref = sf_open ("test/data/staircase.wav", SFM_READ, &info); + /* We don't want to test anything that requires resampling */ + BOOST_REQUIRE_EQUAL (info.samplerate, 48000); + + std::vector buffer(info.channels * 2000); + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + auto reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + auto frame = reader->get_frame(i); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); + sf_readf_short (ref, buffer.data(), this_time); + for (int j = 0; j < this_time; ++j) { + BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]); + } + info.frames -= this_time; + } } + BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) { /* S32 1 channel */ - 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 */ + + SF_INFO info; + info.format = 0; + ref = sf_open ("test/data/sine_440.wav", SFM_READ, &info); + /* We don't want to test anything that requires resampling */ + BOOST_REQUIRE_EQUAL (info.samplerate, 48000); + + std::vector buffer(info.channels * 2000); + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + auto reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + auto frame = reader->get_frame(i); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); + sf_readf_int (ref, buffer.data(), this_time); + for (int j = 0; j < this_time; ++j) { + int32_t s = frame->get(2, j); + if (s > (1 << 23)) { + s -= (1 << 24); + } + BOOST_REQUIRE_MESSAGE (abs(s - (buffer[j] / 256)) <= 1, "failed on asset frame " << i << " sample " << j); + } + info.frames -= this_time; + } +} + + +BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) +{ + /* S24 1 channel */ + auto film = test ("test/data/sine_24_48_440.wav"); + + /* Compare the audio data in the DCP with what libsndfile reads */ + + SF_INFO info; + info.format = 0; + ref = sf_open ("test/data/sine_24_48_440.wav", SFM_READ, &info); + /* We don't want to test anything that requires resampling */ + BOOST_REQUIRE_EQUAL (info.samplerate, 48000); + + std::vector buffer(info.channels * 2000); + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + auto reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + auto frame = reader->get_frame(i); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); + sf_readf_int (ref, buffer.data(), this_time); + for (int j = 0; j < this_time; ++j) { + int32_t s = frame->get(2, j); + if (s > (1 << 23)) { + s -= (1 << 24); + } + BOOST_REQUIRE_MESSAGE (abs(s - buffer[j] /256) <= 1, "failed on asset frame " << i << " sample " << j); + } + info.frames -= this_time; + } }