X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_decoder_test.cc;h=880e3d6b643e2a689cd25762558999dab3da4d33;hp=46f9d5ac63163894dc9dfd9849bee6a30306f2b4;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=ee161be0fb0e93d77d34fb3f13fd562a76738a07

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 46f9d5ac6..880e3d6b6 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,36 +25,60 @@
 #include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/audio_decoder.h"
-#include "lib/audio_content.h"
+#include "lib/single_stream_audio_content.h"
 
 using std::string;
 using std::cout;
 using std::min;
 using boost::shared_ptr;
 
+class TestAudioContent : public SingleStreamAudioContent
+{
+public:
+	TestAudioContent (shared_ptr<const Film> film)
+		: Content (film)
+		, SingleStreamAudioContent (film)
+ 	{
+		_audio_stream.reset (new AudioStream (48000, 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 rint (61.2942 * audio_stream()->frame_rate ());
+	}
+};
+
 class TestAudioDecoder : public AudioDecoder
 {
 public:
-	TestAudioDecoder (shared_ptr<AudioContent> content)
+	TestAudioDecoder (shared_ptr<TestAudioContent> content)
 		: AudioDecoder (content)
+		, _test_audio_content (content)
 		, _position (0)
 	{}
 
-	bool pass ()
+	bool pass (PassReason)
 	{
-		AudioFrame const N = min (
-			AudioFrame (2000),
-			_audio_content->audio_length().frames (_audio_content->output_audio_frame_rate ()) - _position
+		Frame const N = min (
+			Frame (2000),
+			_test_audio_content->audio_length() - _position
 			);
 
-		shared_ptr<AudioBuffers> buffers (new AudioBuffers (_audio_content->audio_channels(), N));
-		for (int i = 0; i < _audio_content->audio_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;
 			}
 		}
 
-		audio (buffers, ContentTime::from_frames (_position, _audio_content->output_audio_frame_rate ()));
+		audio (_test_audio_content->audio_stream(), buffers, ContentTime::from_frames (_position, 48000));
 		_position += N;
 
 		return N < 2000;
@@ -63,76 +87,33 @@ public:
 	void seek (ContentTime t, bool accurate)
 	{
 		AudioDecoder::seek (t, accurate);
-		_position = t.frames (_audio_content->output_audio_frame_rate ());
+		_position = t.frames (_test_audio_content->resampled_audio_frame_rate ());
 	}
 
 private:
-	AudioFrame _position;
-};
-
-class TestAudioContent : public AudioContent
-{
-public:
-	TestAudioContent (shared_ptr<Film> 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 content_audio_frame_rate () const {
-		return 48000;
-	}
-
-	int output_audio_frame_rate () const {
-		return 48000;
-	}
-
-	AudioMapping audio_mapping () const {
-		return AudioMapping (audio_channels ());
-	}
-
-	void set_audio_mapping (AudioMapping) {}
+	boost::shared_ptr<TestAudioContent> _test_audio_content;
+	Frame _position;
 };
 
 shared_ptr<TestAudioContent> content;
 shared_ptr<TestAudioDecoder> decoder;
 
-static shared_ptr<ContentAudio>
-get (AudioFrame from, AudioFrame length)
+static ContentAudio
+get (Frame from, Frame length)
 {
-	decoder->seek (ContentTime::from_frames (from, content->output_audio_frame_rate ()), true);
-	shared_ptr<ContentAudio> ca = decoder->get_audio (from, length, true);
-	BOOST_CHECK_EQUAL (ca->frame, from);
+	decoder->seek (ContentTime::from_frames (from, content->resampled_audio_frame_rate ()), true);
+	ContentAudio ca = decoder->get_audio (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<ContentAudio> 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);
 		}
 	}
 }
@@ -152,14 +133,13 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
 
 	/* Read off the end */
 
-	AudioFrame const from = content->output_audio_frame_rate() * 61;
-	AudioFrame const length = content->output_audio_frame_rate() * 4;
-	shared_ptr<ContentAudio> ca = get (from, length);
+	Frame const from = content->resampled_audio_frame_rate() * 61;
+	Frame const length = content->resampled_audio_frame_rate() * 4;
+	ContentAudio 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);
+	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);
 		}
 	}
 }