projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Sndfile code and use FFmpeg instead.
[dcpomatic.git]
/
test
/
audio_delay_test.cc
diff --git
a/test/audio_delay_test.cc
b/test/audio_delay_test.cc
index 2e02fa999e9b1e5d617bf2c0bc5b9f064dec60b3..a538da4ed655f58c46821bf8fef924e6b4bf4095 100644
(file)
--- a/
test/audio_delay_test.cc
+++ b/
test/audio_delay_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,17
+17,25
@@
*/
*/
+/** @file test/audio_delay_test.cc
+ * @brief Test encode using some FFmpegContents which have audio delays.
+ *
+ * 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 <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/sound_
asset
.h>
#include <dcp/reel_sound_asset.h>
#include <dcp/reel_sound_asset.h>
-#include "lib/
sndfile
_content.h"
+#include "lib/
ffmpeg
_content.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/film.h"
+#include "lib/audio_content.h"
#include "test.h"
#include "test.h"
+#include <iostream>
using std::string;
using std::cout;
using std::string;
using std::cout;
@@
-37,14
+45,16
@@
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);
shared_ptr<Film> film = new_test_film (film_name);
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_dcp_content_type (DCPContentType::from_
isdcf
_name ("FTR"));
film->set_container (Ratio::from_id ("185"));
film->set_name (film_name);
film->set_container (Ratio::from_id ("185"));
film->set_name (film_name);
- shared_ptr<
SndfileContent> content (new Sndfile
Content (film, "test/data/staircase.wav"));
- content->
set_audio
_delay (delay_in_ms);
+ shared_ptr<
FFmpegContent> content (new FFmpeg
Content (film, "test/data/staircase.wav"));
+ content->
audio->set
_delay (delay_in_ms);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
@@
-67,11
+77,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
()->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);
@@
-81,13
+91,12
@@
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)
{