X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_decoder_test.cc;h=945773d1203fc24cda5b45432da94df5073a7d88;hp=a14e2f9be0ace14299c1c6d756828699af53236c;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=e491397c0028a80ac4a48a92007f783746553c1a diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc index a14e2f9be..945773d12 100644 --- a/test/audio_decoder_test.cc +++ b/test/audio_decoder_test.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2014 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,40 +22,68 @@ * @brief Tests of the AudioDecoder class. */ -#include -#include #include "test.h" +#include "lib/content.h" #include "lib/audio_decoder.h" #include "lib/audio_content.h" +#include "lib/film.h" +#include +#include +#include using std::string; using std::cout; using std::min; using boost::shared_ptr; -class TestAudioDecoder : public AudioDecoder +class TestAudioContent : public Content +{ +public: + TestAudioContent (shared_ptr film) + : Content (film) + { + audio.reset (new AudioContent (this)); + audio->set_stream (AudioStreamPtr (new AudioStream (48000, audio_length(), 2))); + } + + std::string summary () const { + return ""; + } + + DCPTime full_length () const { + return DCPTime::from_seconds (float (audio_length()) / audio->stream()->frame_rate ()); + } + + Frame audio_length () const { + return llrint (61.2942 * 48000); + } +}; + +class TestAudioDecoder : public Decoder { public: - TestAudioDecoder (shared_ptr content) - : AudioDecoder (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 () + bool pass (PassReason, bool) { - AudioFrame const N = min ( - AudioFrame (2000), - _audio_content->audio_length().frames (_audio_content->resampled_audio_frame_rate ()) - _position + Frame const N = min ( + Frame (2000), + _test_audio_content->audio_length() - _position ); - shared_ptr buffers (new AudioBuffers (_audio_content->audio_channels(), N)); - for (int i = 0; i < _audio_content->audio_channels(); ++i) { + shared_ptr buffers (new AudioBuffers (_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 (buffers, ContentTime::from_frames (_position, _audio_content->resampled_audio_frame_rate ())); + audio->give (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000)); _position += N; return N < 2000; @@ -62,73 +91,34 @@ public: void seek (ContentTime t, bool accurate) { - AudioDecoder::seek (t, accurate); - _position = t.frames (_audio_content->resampled_audio_frame_rate ()); + audio->seek (t, accurate); + _position = t.frames_round (_test_audio_content->audio->resampled_frame_rate ()); } private: - AudioFrame _position; -}; - -class TestAudioContent : public AudioContent -{ -public: - TestAudioContent (shared_ptr film) - : Content (film) - , AudioContent (film, DCPTime ()) - {} - - string summary () const { - return ""; - } - - string information () const { - return ""; - } - - DCPTime full_length () const { - return DCPTime (audio_length().get ()); - } - - int audio_channels () const { - return 2; - } - - ContentTime audio_length () const { - return ContentTime::from_seconds (61.2942); - } - - int audio_frame_rate () const { - return 48000; - } - - AudioMapping audio_mapping () const { - return AudioMapping (audio_channels ()); - } - - void set_audio_mapping (AudioMapping) {} + boost::shared_ptr _test_audio_content; + Frame _position; }; shared_ptr content; shared_ptr decoder; -static shared_ptr -get (AudioFrame from, AudioFrame length) +static ContentAudio +get (Frame from, Frame length) { - decoder->seek (ContentTime::from_frames (from, content->resampled_audio_frame_rate ()), true); - shared_ptr ca = decoder->get_audio (from, length, true); - BOOST_CHECK_EQUAL (ca->frame, from); + 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; } static void -check (AudioFrame from, AudioFrame length) +check (Frame from, Frame length) { - shared_ptr ca = get (from, length); - for (int i = 0; i < content->audio_channels(); ++i) { + ContentAudio ca = get (from, length); + for (int i = 0; i < content->audio->stream()->channels(); ++i) { for (int j = 0; j < length; ++j) { - BOOST_CHECK_EQUAL (ca->audio->data(i)[j], j + from); - assert (ca->audio->data(i)[j] == j + from); + BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from); } } } @@ -139,23 +129,23 @@ 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 */ - AudioFrame const from = content->resampled_audio_frame_rate() * 61; - AudioFrame const length = content->resampled_audio_frame_rate() * 4; - shared_ptr ca = get (from, length); - - for (int i = 0; i < content->audio_channels(); ++i) { - for (int j = 0; j < ca->audio->frames(); ++j) { - BOOST_CHECK_EQUAL (ca->audio->data(i)[j], j + from); - assert (ca->audio->data(i)[j] == j + from); + 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 j = 0; j < ca.audio->frames(); ++j) { + BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from); } } }