X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_delay_test.cc;h=688186e004973b53a10d002b87a951b5a38156b7;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=5574bd627a94cf98487a2154814560aa4bc6b2ee;hpb=39c36075c62ce4c148ce14de0ae7b29d8427be2b;p=dcpomatic.git

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 5574bd627..688186e00 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -1,54 +1,75 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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/>.
 
 */
 
-#include <libdcp/sound_frame.h>
-#include <libdcp/cpl.h>
-#include <libdcp/reel.h>
-#include <libdcp/sound_asset.h>
-#include "sndfile_content.h"
 
+/** @defgroup feature Tests of features */
+
+/** @file  test/audio_delay_test.cc
+ *  @brief Test encode using some FFmpegContents which have audio delays.
+ *  @ingroup feature
+ *
+ *  The output is checked algorithmically using knowledge of the input.
+ */
+
+
+#include "lib/audio_content.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "test.h"
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/sound_frame.h>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
+
+
+using std::cout;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using boost::lexical_cast;
 
+
 static
 void test_audio_delay (int delay_in_ms)
 {
 	string const film_name = "audio_delay_test_" + lexical_cast<string> (delay_in_ms);
-	shared_ptr<Film> film = new_test_film (film_name);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
-	film->set_container (Ratio::from_id ("185"));
-	film->set_name (film_name);
+	auto content = make_shared<FFmpegContent>("test/data/staircase.wav");
+	auto film = new_test_film2 (film_name, { content });
 
-	shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/staircase.wav"));
-	content->set_audio_delay (delay_in_ms);
-	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	content->audio->set_delay (delay_in_ms);
 
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
 	boost::filesystem::path path = "build/test";
 	path /= film_name;
 	path /= film->dcp_name ();
-	libdcp::DCP check (path.string ());
+	dcp::DCP check (path.string ());
 	check.read ();
 
-	shared_ptr<const libdcp::SoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+	auto sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
 
 	/* Sample index in the DCP */
@@ -57,13 +78,12 @@ void test_audio_delay (int delay_in_ms)
 	int frame = 0;
 	/* Delay in frames */
 	int const delay_in_frames = delay_in_ms * 48000 / 1000;
-	bool done = false;
 
-	while (n < sound_asset->intrinsic_duration()) {
-		shared_ptr<const libdcp::SoundFrame> sound_frame = sound_asset->get_frame (frame++);
+	while (n < sound_asset->asset()->intrinsic_duration()) {
+		auto sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
 		uint8_t const * d = sound_frame->data ();
-		
-		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->channels())) {
+
+		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
 
 			/* Mono input so it will appear on centre */
 			int const sample = d[i + 7] | (d[i + 8] << 8);
@@ -73,7 +93,7 @@ void test_audio_delay (int delay_in_ms)
 				delayed = 0;
 			}
 
-			BOOST_CHECK_EQUAL (sample, delayed);
+			BOOST_REQUIRE_EQUAL (sample, delayed);
 			++n;
 		}
 	}