projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default to making SMPTE DCPs on new installs.
[dcpomatic.git]
/
test
/
audio_delay_test.cc
diff --git
a/test/audio_delay_test.cc
b/test/audio_delay_test.cc
index 68e14ff3ca353f470d9f09f8c14112f6713b34a4..d8d69424bd1a44144004dcffed39b03c2a9f61f5 100644
(file)
--- a/
test/audio_delay_test.cc
+++ b/
test/audio_delay_test.cc
@@
-1,69
+1,80
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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.
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
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/>.
*/
*/
+
+/** @defgroup feature Tests of features */
+
/** @file test/audio_delay_test.cc
/** @file test/audio_delay_test.cc
- * @brief Test encode using some SndfileContents which have audio delays.
+ * @brief Test encode using some FFmpegContents which have audio delays.
+ * @ingroup feature
*
* The output is checked algorithmically using knowledge of the input.
*/
*
* The output is checked algorithmically using knowledge of the input.
*/
-#include <boost/test/unit_test.hpp>
-#include <dcp/sound_frame.h>
-#include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/sound_mxf.h>
-#include <dcp/reel_sound_asset.h>
-#include "lib/sndfile_content.h"
+
+#include "lib/audio_content.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content_type.h"
-#include "lib/
ratio
.h"
+#include "lib/
ffmpeg_content
.h"
#include "lib/film.h"
#include "lib/film.h"
+#include "lib/ratio.h"
#include "test.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::string;
using std::cout;
using std::cout;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
using boost::lexical_cast;
using boost::lexical_cast;
-using boost::shared_ptr;
+
static
void test_audio_delay (int delay_in_ms)
{
static
void test_audio_delay (int delay_in_ms)
{
+ BOOST_TEST_MESSAGE ("Testing delay of " << delay_in_ms);
+
string const film_name = "audio_delay_test_" + lexical_cast<string> (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_isdcf_name ("FTR"));
- film->set_container (Ratio::from_id ("185"));
-
film->set_name (film_name
);
+
auto content = make_shared<FFmpegContent>("test/data/staircase.wav"
);
+ shared_ptr<Film> 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 ();
boost::filesystem::path path = "build/test";
path /= film_name;
path /= film->dcp_name ();
+ std::cout << "Loading " << path.string() << "\n";
dcp::DCP check (path.string ());
check.read ();
dcp::DCP check (path.string ());
check.read ();
-
shared_ptr<const dcp::ReelSoundAsset>
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 */
BOOST_CHECK (sound_asset);
/* Sample index in the DCP */
@@
-73,11
+84,11
@@
void test_audio_delay (int delay_in_ms)
/* Delay in frames */
int const delay_in_frames = delay_in_ms * 48000 / 1000;
/* Delay in frames */
int const delay_in_frames = delay_in_ms * 48000 / 1000;
- while (n < sound_asset->
mxf
()->intrinsic_duration()) {
- shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->
mxf
()->get_frame (frame++);
+ while (n < sound_asset->
asset
()->intrinsic_duration()) {
+ shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->
asset()->start_read
()->get_frame (frame++);
uint8_t const * d = sound_frame->data ();
uint8_t const * d = sound_frame->data ();
-
- for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->
mxf
()->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);
/* Mono input so it will appear on centre */
int const sample = d[i + 7] | (d[i + 8] << 8);
@@
-87,12
+98,13
@@
void test_audio_delay (int delay_in_ms)
delayed = 0;
}
delayed = 0;
}
- BOOST_
CHECK
_EQUAL (sample, delayed);
+ BOOST_
REQUIRE
_EQUAL (sample, delayed);
++n;
}
}
}
++n;
}
}
}
+
/* Test audio delay when specified in a piece of audio content */
BOOST_AUTO_TEST_CASE (audio_delay_test)
{
/* Test audio delay when specified in a piece of audio content */
BOOST_AUTO_TEST_CASE (audio_delay_test)
{