X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_only_test.cc;h=a8a7184c4e264883b7de730afec4adc3cc4c073c;hb=cbecfe7ff652d61608f752239de8d134b052a28f;hp=bad800e57823a21fd2874442ff2d61304a25ce82;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index bad800e57..a8a7184c4 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-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,11 @@ */ +/** @file test/ffmpeg_audio_only_test.cc + * @brief Test FFmpeg content with audio but no video. + * @ingroup specific + */ + #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" @@ -25,68 +30,173 @@ #include "lib/job_manager.h" #include "lib/audio_buffers.h" #include "test.h" +#include +#include #include #include +#include +using std::min; using boost::shared_ptr; -/** Test the FFmpeg code with audio-only content */ +static SNDFILE* ref = 0; +static int ref_buffer_size = 0; +static float* ref_buffer = 0; + static void +audio (boost::shared_ptr audio, int channels) +{ + /* Check that we have a big enough buffer */ + BOOST_CHECK (audio->frames() * audio->channels() < ref_buffer_size); + + int const N = sf_readf_float (ref, ref_buffer, audio->frames()); + for (int i = 0; i < N; ++i) { + switch (channels) { + case 1: + BOOST_CHECK_EQUAL (ref_buffer[i], audio->data(2)[i]); + break; + case 2: + BOOST_CHECK_EQUAL (ref_buffer[i*2 + 0], audio->data(0)[i]); + BOOST_CHECK_EQUAL (ref_buffer[i*2 + 1], audio->data(1)[i]); + break; + default: + BOOST_REQUIRE (false); + } + } +} + +/** 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"); film->set_name ("test_film"); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); - shared_ptr c (new FFmpegContent (film, file)); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + shared_ptr c (new FFmpegContent(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 (); + BOOST_REQUIRE (!wait_for_jobs()); 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; - SNDFILE* ref = sf_open (file.string().c_str(), SFM_READ, &info); + 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); - float* ref_buffer = new float[info.samplerate * info.channels]; + ref_buffer_size = info.samplerate * info.channels; + ref_buffer = new float[ref_buffer_size]; shared_ptr player (new Player (film, film->playlist ())); - for (DCPTime t; t < film->length(); t += DCPTime::from_seconds (1)) { - int const N = sf_readf_float (ref, ref_buffer, info.samplerate); - shared_ptr b = player->get_audio (t, DCPTime::from_frames (N, info.samplerate), true); - for (int i = 0; i < N; ++i) { - switch (info.channels) { - case 1: - BOOST_CHECK_EQUAL (ref_buffer[i], b->data(2)[i]); - break; - case 2: - BOOST_CHECK_EQUAL (ref_buffer[i*2 + 0], b->data(0)[i]); - BOOST_CHECK_EQUAL (ref_buffer[i*2 + 1], b->data(1)[i]); - break; - default: - BOOST_REQUIRE (false); - } - } - } + player->Audio.connect (bind (&audio, _1, info.channels)); + while (!player->pass ()) {} sf_close (ref); + delete[] ref_buffer; + + return film; } BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) { /* S16 */ - test ("test/data/staircase.wav"); + shared_ptr 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); + + int16_t* buffer = new int16_t[info.channels * 2000]; + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + shared_ptr reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + shared_ptr 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) { + BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]); + } + info.frames -= this_time; + } + + delete[] buffer; } BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) { /* S32 1 channel */ - test ("test/data/sine_440.wav"); + shared_ptr 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); + + int32_t* buffer = new int32_t[info.channels * 2000]; + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + shared_ptr reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + shared_ptr 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) { + 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; + } + + delete[] buffer; +} + +BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) +{ + /* S24 1 channel */ + shared_ptr 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); + + int32_t* buffer = new int32_t[info.channels * 2000]; + + dcp::SoundAsset asset (dcp_file(film, "pcm")); + shared_ptr reader = asset.start_read (); + for (int i = 0; i < asset.intrinsic_duration(); ++i) { + shared_ptr 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) { + 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; + } + + delete[] buffer; }