X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_decoder_test.cc;h=92c99a378065389c800ba459682ecb6e785d8983;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=48118c1b7dd85d1308304ab2ff1db64951192af1;hpb=9e025d3f85f9d6d855b3d5e6c90bca0eac3a3d49;p=dcpomatic.git diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc index 48118c1b7..92c99a378 100644 --- a/test/audio_decoder_test.cc +++ b/test/audio_decoder_test.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2016 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 . */ @@ -21,26 +22,30 @@ * @brief Tests of the AudioDecoder class. */ -#include -#include #include "test.h" +#include "lib/content.h" #include "lib/audio_decoder.h" -#include "lib/single_stream_audio_content.h" +#include "lib/audio_content.h" +#include "lib/film.h" +#include +#include +#include #include using std::string; using std::cout; using std::min; using boost::shared_ptr; +using boost::make_shared; -class TestAudioContent : public SingleStreamAudioContent +class TestAudioContent : public Content { public: TestAudioContent (shared_ptr film) : Content (film) - , SingleStreamAudioContent (film) { - _audio_stream.reset (new AudioStream (48000, 2)); + audio.reset (new AudioContent (this)); + audio->set_stream (AudioStreamPtr (new AudioStream (48000, audio_length(), 2))); } std::string summary () const { @@ -48,38 +53,39 @@ public: } DCPTime full_length () const { - return DCPTime::from_seconds (float (audio_length()) / audio_stream()->frame_rate ()); + return DCPTime::from_seconds (float (audio_length()) / audio->stream()->frame_rate ()); } Frame audio_length () const { - return llrint (61.2942 * audio_stream()->frame_rate ()); + return llrint (61.2942 * 48000); } }; -class TestAudioDecoder : public AudioDecoder +class TestAudioDecoder : public Decoder { public: - TestAudioDecoder (shared_ptr content) - : AudioDecoder (content, false) - , _test_audio_content (content) + TestAudioDecoder (shared_ptr content, shared_ptr log) + : _test_audio_content (content) , _position (0) - {} + { + audio.reset (new AudioDecoder (this, content->audio, false, log)); + } - bool pass (PassReason) + bool pass (PassReason, bool) { Frame const N = min ( Frame (2000), _test_audio_content->audio_length() - _position ); - shared_ptr buffers (new AudioBuffers (_test_audio_content->audio_stream()->channels(), N)); - for (int i = 0; i < _test_audio_content->audio_stream()->channels(); ++i) { + shared_ptr buffers = make_shared (_test_audio_content->audio->stream()->channels(), N); + for (int i = 0; i < _test_audio_content->audio->stream()->channels(); ++i) { for (int j = 0; j < N; ++j) { buffers->data(i)[j] = j + _position; } } - audio (_test_audio_content->audio_stream(), buffers, ContentTime::from_frames (_position, 48000)); + audio->give (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000)); _position += N; return N < 2000; @@ -87,8 +93,8 @@ public: void seek (ContentTime t, bool accurate) { - AudioDecoder::seek (t, accurate); - _position = t.frames_round (_test_audio_content->resampled_audio_frame_rate ()); + audio->seek (t, accurate); + _position = t.frames_round (_test_audio_content->audio->resampled_frame_rate ()); } private: @@ -102,8 +108,8 @@ shared_ptr decoder; static ContentAudio get (Frame from, Frame length) { - decoder->seek (ContentTime::from_frames (from, content->resampled_audio_frame_rate ()), true); - ContentAudio ca = decoder->get_audio (content->audio_stream(), from, length, true); + decoder->seek (ContentTime::from_frames (from, content->audio->resampled_frame_rate ()), true); + ContentAudio ca = decoder->audio->get (content->audio->stream(), from, length, true); BOOST_CHECK_EQUAL (ca.frame, from); return ca; } @@ -112,7 +118,7 @@ static void check (Frame from, Frame length) { ContentAudio ca = get (from, length); - for (int i = 0; i < content->audio_stream()->channels(); ++i) { + for (int i = 0; i < content->audio->stream()->channels(); ++i) { for (int j = 0; j < length; ++j) { BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from); } @@ -125,20 +131,21 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test) shared_ptr film = new_test_film ("audio_decoder_test"); content.reset (new TestAudioContent (film)); - decoder.reset (new TestAudioDecoder (content)); + decoder.reset (new TestAudioDecoder (content, film->log())); /* Simple reads */ + check (0, 48000); check (44, 9123); check (9991, 22); /* Read off the end */ - Frame const from = content->resampled_audio_frame_rate() * 61; - Frame const length = content->resampled_audio_frame_rate() * 4; + Frame const from = content->audio->resampled_frame_rate() * 61; + Frame const length = content->audio->resampled_frame_rate() * 4; ContentAudio ca = get (from, length); - for (int i = 0; i < content->audio_stream()->channels(); ++i) { + for (int i = 0; i < content->audio->stream()->channels(); ++i) { for (int j = 0; j < ca.audio->frames(); ++j) { BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from); }