Remove seek zero test as I think it's fairly specific to the old code.

[dcpomatic.git] / test / audio_decoder_test.cc

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index f714e06822e580638fc20465a24b159dbb1d96c0..6e92c48dedaabb7f63744fcfe4bd506199b044f3 100644 (file)
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2016 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.
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,6 +26,9 @@
 #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>
@@ -41,8 +45,8 @@ public:
        TestAudioContent (shared_ptr<const Film> film)
                : Content (film)
        {
-               audio.reset (new AudioContent (this, film));
-               audio->set_stream (AudioStreamPtr (new AudioStream (48000, 2)));
+               audio.reset (new AudioContent (this));
+               audio->set_stream (AudioStreamPtr (new AudioStream (48000, audio_length(), 2)));
        }
 
        std::string summary () const {
@@ -54,20 +58,21 @@ public:
        }
 
        Frame audio_length () const {
-               return llrint (61.2942 * audio->stream()->frame_rate ());
+               return llrint (61.2942 * 48000);
        }
 };
 
-class TestAudioDecoder : public AudioDecoder
+class TestAudioDecoder : public Decoder
 {
 public:
        TestAudioDecoder (shared_ptr<TestAudioContent> content, shared_ptr<Log> log)
-               : AudioDecoder (content->audio, false, log)
-               , _test_audio_content (content)
+               : _test_audio_content (content)
                , _position (0)
-       {}
+       {
+               audio.reset (new AudioDecoder (this, content->audio, log));
+       }
 
-       bool pass (PassReason, bool)
+       bool pass ()
        {
                Frame const N = min (
                        Frame (2000),
@@ -81,7 +86,7 @@ public:
                        }
                }
 
-               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;
@@ -89,8 +94,7 @@ public:
 
        void seek (ContentTime t, bool accurate)
        {
-               AudioDecoder::seek (t, accurate);
-               _position = t.frames_round (_test_audio_content->audio->resampled_audio_frame_rate ());
+               _position = t.frames_round (_test_audio_content->audio->resampled_frame_rate ());
        }
 
 private:
@@ -104,8 +108,8 @@ shared_ptr<TestAudioDecoder> decoder;
 static ContentAudio
 get (Frame from, Frame length)
 {
-       decoder->seek (ContentTime::from_frames (from, content->audio->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;
 }
@@ -137,8 +141,8 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
 
        /* Read off the end */
 
-       Frame const from = content->audio->resampled_audio_frame_rate() * 61;
-       Frame const length = content->audio->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);
 
        for (int i = 0; i < content->audio->stream()->channels(); ++i) {
@@ -147,3 +151,18 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
                }
        }
 }
+
+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 ());
+}