X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_decoder_test.cc;h=273d04344d79b23f7ac449747a8480629cda6e6f;hb=2268783ea44e97e118d6fd164618fcf736563e29;hp=73d5154929f82e9a08889ed3b03440506955d4ef;hpb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;p=dcpomatic.git

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 73d515492..273d04344 100644
--- 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,7 +58,7 @@ public:
 	}
 
 	Frame audio_length () const {
-		return llrint (61.2942 * audio->stream()->frame_rate ());
+		return llrint (61.2942 * 48000);
 	}
 };
 
@@ -65,7 +69,7 @@ public:
 		: _test_audio_content (content)
 		, _position (0)
 	{
-		audio.reset (new AudioDecoder (this, content->audio, false, log));
+		audio.reset (new AudioDecoder (this, content->audio, log));
 	}
 
 	bool pass (PassReason, bool)
@@ -148,3 +152,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");
+	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 ());
+}