Remove another old test.

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
deleted file mode 100644 (file)
index 6e92c48..0000000
--- a/test/audio_decoder_test.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/** @file  test/audio_decoder_test.cc
- *  @brief Tests of the AudioDecoder class.
- */
-
-#include "test.h"
-#include "lib/content.h"
-#include "lib/audio_decoder.h"
-#include "lib/audio_content.h"
-#include "lib/content_factory.h"
-#include "lib/dcp_content_type.h"
-#include "lib/ratio.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;
-
-class TestAudioContent : public Content
-{
-public:
-       TestAudioContent (shared_ptr<const Film> 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<TestAudioContent> content, shared_ptr<Log> log)
-               : _test_audio_content (content)
-               , _position (0)
-       {
-               audio.reset (new AudioDecoder (this, content->audio, log));
-       }
-
-       bool pass ()
-       {
-               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) {
-                       for (int j = 0; j < N; ++j) {
-                               buffers->data(i)[j] = j + _position;
-                       }
-               }
-
-               audio->give (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000));
-               _position += N;
-
-               return N < 2000;
-       }
-
-       void seek (ContentTime t, bool accurate)
-       {
-               _position = t.frames_round (_test_audio_content->audio->resampled_frame_rate ());
-       }
-
-private:
-       boost::shared_ptr<TestAudioContent> _test_audio_content;
-       Frame _position;
-};
-
-shared_ptr<TestAudioContent> content;
-shared_ptr<TestAudioDecoder> decoder;
-
-static ContentAudio
-get (Frame from, Frame length)
-{
-       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 (Frame from, Frame length)
-{
-       ContentAudio ca = get (from, length);
-       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);
-               }
-       }
-}
-
-/** 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, film->log()));
-
-       /* Simple reads */
-
-       check (0, 48000);
-       check (44, 9123);
-       check (9991, 22);
-
-       /* Read off the end */
-
-       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);
-               }
-       }
-}
-
-BOOST_AUTO_TEST_CASE (audio_decoder_test)
-{
-       shared_ptr<Film> film = new_test_film ("analyse_audio_test");
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-       film->set_name ("frobozz");
-       shared_ptr<Content> content = content_factory(film, private_data / "20 The Wedding Convoy Song.m4a").front();
-       film->examine_and_add_content (content);
-       wait_for_jobs ();
-
-       content->set_trim_start (ContentTime::from_seconds (60));
-       film->make_dcp ();
-       BOOST_CHECK (!wait_for_jobs ());
-}

diff --git a/test/wscript b/test/wscript
index 69ba14b354a789675c8ebba40e49d4b3ac010c95..0fb32670cca8cc2d4e282b52496a2df6de7c480d 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -102,7 +102,6 @@ def build(bld):
     # resampler_test.cc
 
     # XXX
-    # audio_decoder_test.cc
     # dcp_subtitle_test.cc
     # ffmpeg_decoder_seek_test.cc
     # ffmpeg_decoder_sequential_test.cc