X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_merger_test.cc;h=336dfcdf38e5d58a87d47e1252154065f284ace1;hp=2fa0ccea5945a61a4b72624bac24dc3312495005;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=978be856218cc15f059b7e267811e7302c37b24d diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index 2fa0ccea5..336dfcdf3 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -1,64 +1,93 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include + +/** @file test/audio_merger_test.cc + * @brief Test AudioMerger class. + * @ingroup selfcontained + */ + + +#include "lib/cross.h" #include "lib/audio_merger.h" #include "lib/audio_buffers.h" +#include "lib/dcpomatic_time.h" +#include "test.h" +#include +#include +#include +#include +#include +#include + -using boost::shared_ptr; +using std::pair; +using std::make_shared; +using std::list; +using std::cout; +using std::string; +using std::shared_ptr; using boost::bind; +using namespace dcpomatic; + static shared_ptr last_audio; -BOOST_AUTO_TEST_CASE (audio_merger_test1) -{ - int const frame_rate = 48000; - AudioMerger merger (1, frame_rate); - /* Push 64 samples, 0 -> 63 at time 0 */ - shared_ptr buffers (new AudioBuffers (1, 64)); - for (int i = 0; i < 64; ++i) { - buffers->data()[0][i] = i; +int const sampling_rate = 48000; + + +static void +push (AudioMerger& merger, int from, int to, int at) +{ + auto buffers = make_shared(1, to - from); + for (int i = 0; i < (to - from); ++i) { + buffers->data()[0][i] = from + i; } - merger.push (buffers, DCPTime ()); + merger.push (buffers, DCPTime(at, sampling_rate)); +} - /* Push 64 samples, 0 -> 63 at time 22 */ - merger.push (buffers, DCPTime::from_frames (22, frame_rate)); - TimedAudioBuffers tb = merger.pull (DCPTime::from_frames (22, frame_rate)); - BOOST_CHECK (tb.audio != shared_ptr ()); - BOOST_CHECK_EQUAL (tb.audio->frames(), 22); - BOOST_CHECK_EQUAL (tb.time, DCPTime ()); +/* Basic mixing, 2 overlapping pushes */ +BOOST_AUTO_TEST_CASE (audio_merger_test1) +{ + AudioMerger merger (sampling_rate); + + push (merger, 0, 64, 0); + push (merger, 0, 64, 22); + + auto tb = merger.pull (DCPTime::from_frames (22, sampling_rate)); + BOOST_REQUIRE (tb.size() == 1U); + BOOST_CHECK (tb.front().first != shared_ptr ()); + BOOST_CHECK_EQUAL (tb.front().first->frames(), 22); + BOOST_CHECK_EQUAL (tb.front().second.get(), 0); /* And they should be a staircase */ for (int i = 0; i < 22; ++i) { - BOOST_CHECK_EQUAL (tb.audio->data()[0][i], i); + BOOST_CHECK_EQUAL (tb.front().first->data()[0][i], i); } - tb = merger.flush (); - - /* That flush should give us 64 samples at 22 */ - BOOST_CHECK_EQUAL (tb.audio->frames(), 64); - BOOST_CHECK_EQUAL (tb.time, DCPTime::from_frames (22, frame_rate)); + tb = merger.pull (DCPTime::from_frames (22 + 64, sampling_rate)); + BOOST_REQUIRE (tb.size() == 1U); + BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); + BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get()); /* Check the sample values */ for (int i = 0; i < 64; ++i) { @@ -66,38 +95,97 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1) if (i < (64 - 22)) { correct += i + 22; } - BOOST_CHECK_EQUAL (tb.audio->data()[0][i], correct); + BOOST_CHECK_EQUAL (tb.front().first->data()[0][i], correct); } } + +/* Push at non-zero time */ BOOST_AUTO_TEST_CASE (audio_merger_test2) { - int const frame_rate = 48000; - AudioMerger merger (1, frame_rate); + AudioMerger merger (sampling_rate); - /* Push 64 samples, 0 -> 63 at time 9 */ - shared_ptr buffers (new AudioBuffers (1, 64)); + push (merger, 0, 64, 9); + + /* There's nothing from 0 to 9 */ + auto tb = merger.pull (DCPTime::from_frames (9, sampling_rate)); + BOOST_CHECK_EQUAL (tb.size(), 0U); + + /* Then there's our data at 9 */ + tb = merger.pull (DCPTime::from_frames (9 + 64, sampling_rate)); + + BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); + BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(9, sampling_rate).get()); + + /* Check the sample values */ for (int i = 0; i < 64; ++i) { - buffers->data()[0][i] = i; + BOOST_CHECK_EQUAL (tb.front().first->data()[0][i], i); } - merger.push (buffers, DCPTime::from_frames (9, frame_rate)); - - TimedAudioBuffers tb = merger.pull (DCPTime::from_frames (9, frame_rate)); - BOOST_CHECK_EQUAL (tb.audio->frames(), 9); - BOOST_CHECK_EQUAL (tb.time, DCPTime ()); - - for (int i = 0; i < 9; ++i) { - BOOST_CHECK_EQUAL (tb.audio->data()[0][i], 0); +} + + +/* Push two non contiguous blocks */ +BOOST_AUTO_TEST_CASE (audio_merger_test3) +{ + AudioMerger merger (sampling_rate); + + push (merger, 0, 64, 17); + push (merger, 0, 64, 114); + + /* Get them back */ + + auto tb = merger.pull (DCPTime::from_frames (100, sampling_rate)); + BOOST_REQUIRE (tb.size() == 1U); + BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); + BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get()); + for (int i = 0; i < 64; ++i) { + BOOST_CHECK_EQUAL (tb.front().first->data()[0][i], i); } - - tb = merger.flush (); - /* That flush should give us 64 samples at 9 */ - BOOST_CHECK_EQUAL (tb.audio->frames(), 64); - BOOST_CHECK_EQUAL (tb.time, DCPTime::from_frames (9, frame_rate)); - - /* Check the sample values */ + tb = merger.pull (DCPTime::from_frames (200, sampling_rate)); + BOOST_REQUIRE (tb.size() == 1U); + BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); + BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get()); for (int i = 0; i < 64; ++i) { - BOOST_CHECK_EQUAL (tb.audio->data()[0][i], i); + BOOST_CHECK_EQUAL (tb.front().first->data()[0][i], i); } } + + +/* Reply a sequence of calls to AudioMerger that resulted in a crash */ +BOOST_AUTO_TEST_CASE (audio_merger_test4) +{ + dcp::File f("test/data/audio_merger_bug1.log", "r"); + BOOST_REQUIRE (f); + list tokens; + char buf[64]; + while (fscanf(f.get(), "%63s", buf) == 1) { + tokens.push_back (buf); + } + + shared_ptr merger; + auto i = tokens.begin (); + while (i != tokens.end()) { + BOOST_CHECK (*i++ == "I/AM"); + string const cmd = *i++; + if (cmd == "frame_rate") { + BOOST_REQUIRE (i != tokens.end()); + merger.reset (new AudioMerger(dcp::raw_convert(*i++))); + } else if (cmd == "clear") { + merger->clear (); + } else if (cmd == "push") { + BOOST_REQUIRE (i != tokens.end()); + DCPTime time(dcp::raw_convert(*i++)); + BOOST_REQUIRE (i != tokens.end()); + int const frames = dcp::raw_convert(*i++); + auto buffers = make_shared(1, frames); + BOOST_REQUIRE (merger); + merger->push (buffers, time); + } else if (cmd == "pull") { + BOOST_REQUIRE (i != tokens.end()); + DCPTime time(dcp::raw_convert(*i++)); + merger->pull (time); + } + } +} +