Various fixes so that audio_delay_test works again.

5 files changed, 273 insertions, 61 deletions

diff --git a/test/README b/test/README
index 6337656f1..a129b6617 100644
--- a/test/README
+++ b/test/README
@@ -7,10 +7,12 @@ They can be grouped roughly into the following:
 
 AudioAnalysis:    audio_analysis_test
 AudioBuffers:     audio_buffers_test
+AudioDecoder:     audio_decoder_test
 AudioMapping:     audio_mapping_test
 ColourConversion: colour_conversion_test
 FileGroup:        file_group_test
 Image:            image_test, pixel_formats_test, make_black_test
+Player:           player_test
 Job/JobManager:   job_test
 SubRip:           subrip_test
 Ratio:            ratio_test
@@ -30,7 +32,6 @@ black_fill_test
 client_server_test
 film_metadata_test
 frame_rate_test
-player_silence_padding_test
 recover_test
 repeat_frame_test
 scaling_test
diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
new file mode 100644
index 000000000..46f9d5ac6
--- /dev/null
+++ b/test/audio_decoder_test.cc
@@ -0,0 +1,165 @@
+/*
+    Copyright (C) 2014 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
+    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,
+    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.
+
+*/
+
+/** @file  test/audio_decoder_test.cc
+ *  @brief Tests of the AudioDecoder class.
+ */
+
+#include <cassert>
+#include <boost/test/unit_test.hpp>
+#include "test.h"
+#include "lib/audio_decoder.h"
+#include "lib/audio_content.h"
+
+using std::string;
+using std::cout;
+using std::min;
+using boost::shared_ptr;
+
+class TestAudioDecoder : public AudioDecoder
+{
+public:
+	TestAudioDecoder (shared_ptr<AudioContent> content)
+		: AudioDecoder (content)
+		, _position (0)
+	{}
+
+	bool pass ()
+	{
+		AudioFrame const N = min (
+			AudioFrame (2000),
+			_audio_content->audio_length().frames (_audio_content->output_audio_frame_rate ()) - _position
+			);
+
+		shared_ptr<AudioBuffers> buffers (new AudioBuffers (_audio_content->audio_channels(), N));
+		for (int i = 0; i < _audio_content->audio_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 ()));
+		_position += N;
+
+		return N < 2000;
+	}
+
+	void seek (ContentTime t, bool accurate)
+	{
+		AudioDecoder::seek (t, accurate);
+		_position = t.frames (_audio_content->output_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) {}
+};
+
+shared_ptr<TestAudioContent> content;
+shared_ptr<TestAudioDecoder> decoder;
+
+static shared_ptr<ContentAudio>
+get (AudioFrame from, AudioFrame 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);
+	return ca;
+}
+
+static void
+check (AudioFrame from, AudioFrame length)
+{
+	shared_ptr<ContentAudio> ca = get (from, length);
+	for (int i = 0; i < content->audio_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);
+		}
+	}
+}
+
+/** Check the logic in AudioDecoder::get_audio */
+BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
+{
+	shared_ptr<Film> film = new_test_film ("audio_decoder_test");
+
+	content.reset (new TestAudioContent (film));
+	decoder.reset (new TestAudioDecoder (content));
+	
+	/* Simple reads */
+	check (0, 48000);
+	check (44, 9123);
+	check (9991, 22);
+
+	/* 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);
+	
+	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);
+		}
+	}
+}
diff --git a/test/player_silence_padding_test.cc b/test/player_silence_padding_test.cc
deleted file mode 100644
index fa8a9b6e6..000000000
--- a/test/player_silence_padding_test.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (C) 2014 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
-    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,
-    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.
-
-*/
-
-/* @file  test/player_silence_padding_test.cc
- * @brief Check that the Player correctly generates silence when used with a silent FFmpegContent.
- */
-
-#include <iostream>
-#include <boost/test/unit_test.hpp>
-#include "lib/film.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
-#include "lib/audio_buffers.h"
-#include "lib/player.h"
-#include "test.h"
-
-using std::cout;
-using boost::shared_ptr;
-
-BOOST_AUTO_TEST_CASE (player_silence_padding_test)
-{
-	shared_ptr<Film> film = new_test_film ("player_silence_padding_test");
-	film->set_name ("player_silence_padding_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	film->set_container (Ratio::from_id ("185"));
-	film->set_audio_channels (6);
-	
-	film->examine_and_add_content (c);
-	wait_for_jobs ();
-
-	shared_ptr<Player> player = film->make_player ();
-	shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
-	BOOST_CHECK_EQUAL (test->frames(), 48000);
-	BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());
-
-	for (int i = 0; i < test->frames(); ++i) {
-		for (int c = 0; c < test->channels(); ++c) {
-			BOOST_CHECK_EQUAL (test->data()[c][i], 0);
-		}
-	}
-}
-
diff --git a/test/player_test.cc b/test/player_test.cc
new file mode 100644
index 000000000..2412fc312
--- /dev/null
+++ b/test/player_test.cc
@@ -0,0 +1,104 @@
+/*
+    Copyright (C) 2014 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
+    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,
+    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.
+
+*/
+
+/** @file  test/player_test.cc
+ *  @brief Various tests of Player.
+ */
+
+#include <iostream>
+#include <boost/test/unit_test.hpp>
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ratio.h"
+#include "lib/audio_buffers.h"
+#include "lib/player.h"
+#include "test.h"
+
+using std::cout;
+using std::list;
+using boost::shared_ptr;
+
+/** Player::overlaps */
+BOOST_AUTO_TEST_CASE (player_overlaps_test)
+{
+	shared_ptr<Film> film = new_test_film ("player_overlaps_test");
+	film->set_container (Ratio::from_id ("185"));
+	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
+
+	film->examine_and_add_content (A);
+	film->examine_and_add_content (B);
+	film->examine_and_add_content (C);
+	wait_for_jobs ();
+
+	BOOST_CHECK_EQUAL (A->full_length(), DCPTime::from_seconds (3));
+
+	A->set_position (DCPTime::from_seconds (0));
+	B->set_position (DCPTime::from_seconds (10));
+	C->set_position (DCPTime::from_seconds (20));
+
+	shared_ptr<Player> player = film->make_player ();
+
+	list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
+	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.front()->content, A);
+
+	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8));
+	BOOST_CHECK_EQUAL (o.size(), 0);
+
+	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12));
+	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.front()->content, B);
+
+	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12));
+	BOOST_CHECK_EQUAL (o.size(), 2);
+	BOOST_CHECK_EQUAL (o.front()->content, A);
+	BOOST_CHECK_EQUAL (o.back()->content, B);
+
+	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11));
+	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.front()->content, B);
+}
+
+/** Check that the Player correctly generates silence when used with a silent FFmpegContent */
+BOOST_AUTO_TEST_CASE (player_silence_padding_test)
+{
+	shared_ptr<Film> film = new_test_film ("player_silence_padding_test");
+	film->set_name ("player_silence_padding_test");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+	
+	film->examine_and_add_content (c);
+	wait_for_jobs ();
+
+	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
+	BOOST_CHECK_EQUAL (test->frames(), 48000);
+	BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());
+
+	for (int i = 0; i < test->frames(); ++i) {
+		for (int c = 0; c < test->channels(); ++c) {
+			BOOST_CHECK_EQUAL (test->data()[c][i], 0);
+		}
+	}
+}
+
diff --git a/test/wscript b/test/wscript
index ec61915a6..c825506fb 100644
--- a/test/wscript
+++ b/test/wscript
@@ -19,6 +19,7 @@ def build(bld):
                  audio_analysis_test.cc
                  audio_buffers_test.cc
                  audio_delay_test.cc
+                 audio_decoder_test.cc
                  audio_mapping_test.cc
                  black_fill_test.cc
                  client_server_test.cc
@@ -35,7 +36,7 @@ def build(bld):
                  image_test.cc
                  job_test.cc
                  make_black_test.cc
-                 player_silence_padding_test.cc
+                 player_test.cc
                  pixel_formats_test.cc
                  ratio_test.cc
                  repeat_frame_test.cc