projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
test
/
audio_decoder_test.cc
diff --git
a/test/audio_decoder_test.cc
b/test/audio_decoder_test.cc
index 00d555d86298ff600946b9002189d061bd3514ad..945773d1203fc24cda5b45432da94df5073a7d88 100644
(file)
--- a/
test/audio_decoder_test.cc
+++ b/
test/audio_decoder_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
6
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,25
+22,28
@@
* @brief Tests of the AudioDecoder class.
*/
* @brief Tests of the AudioDecoder class.
*/
-#include <cassert>
-#include <boost/test/unit_test.hpp>
#include "test.h"
#include "test.h"
+#include "lib/content.h"
#include "lib/audio_decoder.h"
#include "lib/audio_decoder.h"
-#include "lib/single_stream_audio_content.h"
+#include "lib/audio_content.h"
+#include "lib/film.h"
+#include <boost/test/unit_test.hpp>
+#include <cassert>
+#include <iostream>
using std::string;
using std::cout;
using std::min;
using boost::shared_ptr;
using std::string;
using std::cout;
using std::min;
using boost::shared_ptr;
-class TestAudioContent : public
SingleStreamAudio
Content
+class TestAudioContent : public Content
{
public:
TestAudioContent (shared_ptr<const Film> film)
: Content (film)
{
public:
TestAudioContent (shared_ptr<const Film> 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 {
}
std::string summary () const {
@@
-47,38
+51,39
@@
public:
}
DCPTime full_length () const {
}
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 {
}
Frame audio_length () const {
- return llrint (61.2942 *
audio_stream()->frame_rate ()
);
+ return llrint (61.2942 *
48000
);
}
};
}
};
-class TestAudioDecoder : public
Audio
Decoder
+class TestAudioDecoder : public Decoder
{
public:
{
public:
- TestAudioDecoder (shared_ptr<TestAudioContent> content)
- : AudioDecoder (content)
- , _test_audio_content (content)
+ TestAudioDecoder (shared_ptr<TestAudioContent> content, shared_ptr<Log> log)
+ : _test_audio_content (content)
, _position (0)
, _position (0)
- {}
+ {
+ audio.reset (new AudioDecoder (this, content->audio, false, log));
+ }
- bool pass ()
+ bool pass (
PassReason, bool
)
{
Frame const N = min (
Frame (2000),
_test_audio_content->audio_length() - _position
);
{
Frame const N = min (
Frame (2000),
_test_audio_content->audio_length() - _position
);
- shared_ptr<AudioBuffers> buffers (new AudioBuffers (_test_audio_content->audio
_
stream()->channels(), N));
- for (int i = 0; i < _test_audio_content->audio
_
stream()->channels(); ++i) {
+ shared_ptr<AudioBuffers> 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;
}
}
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;
_position += N;
return N < 2000;
@@
-86,8
+91,8
@@
public:
void seek (ContentTime t, bool accurate)
{
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:
}
private:
@@
-101,8
+106,8
@@
shared_ptr<TestAudioDecoder> decoder;
static ContentAudio
get (Frame from, Frame length)
{
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;
}
BOOST_CHECK_EQUAL (ca.frame, from);
return ca;
}
@@
-111,7
+116,7
@@
static void
check (Frame from, Frame length)
{
ContentAudio ca = get (from, length);
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);
}
for (int j = 0; j < length; ++j) {
BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from);
}
@@
-124,20
+129,21
@@
BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
shared_ptr<Film> film = new_test_film ("audio_decoder_test");
content.reset (new TestAudioContent (film));
shared_ptr<Film> 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 */
/* Simple reads */
+
check (0, 48000);
check (44, 9123);
check (9991, 22);
/* Read off the end */
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);
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);
}
for (int j = 0; j < ca.audio->frames(); ++j) {
BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from);
}