projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make KDM output options checkboxes rather than radios (part of #848).
[dcpomatic.git]
/
test
/
ffmpeg_audio_test.cc
diff --git
a/test/ffmpeg_audio_test.cc
b/test/ffmpeg_audio_test.cc
index 8942558791a8e10b07eee8a64d783651a8f00960..1e9048584de40d9d0dee5e7ba7c69ccc7a6b99c1 100644
(file)
--- a/
test/ffmpeg_audio_test.cc
+++ b/
test/ffmpeg_audio_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-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.
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/>.
*/
*/
@@
-21,22
+22,23
@@
* @brief A simple test of reading audio from an FFmpeg file.
*/
* @brief A simple test of reading audio from an FFmpeg file.
*/
-#include <boost/test/unit_test.hpp>
-#include <dcp/cpl.h>
-#include <dcp/dcp.h>
-#include <dcp/sound_mxf.h>
-#include <dcp/sound_frame.h>
-#include <dcp/reel_sound_asset.h>
-#include <dcp/reel.h>
-#include "lib/sndfile_content.h"
+#include "lib/ffmpeg_content.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
#include "lib/ratio.h"
#include "lib/ffmpeg_content.h"
#include "test.h"
#include "lib/ratio.h"
#include "lib/ffmpeg_content.h"
#include "test.h"
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_frame.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/reel.h>
+#include <boost/test/unit_test.hpp>
using std::string;
using std::string;
-using boost::lexical_cast;
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
@@
-44,14
+46,15
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
film->set_name ("ffmpeg_audio_test");
shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
film->set_name ("ffmpeg_audio_test");
shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
- c->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (c);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
+ c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
- film->set_dcp_content_type (DCPContentType::from_
pretty_name ("Test
"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf_name ("TST
"));
film->make_dcp ();
film->write_metadata ();
film->make_dcp ();
film->write_metadata ();
@@
-65,51
+68,51
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
BOOST_CHECK (sound_asset);
shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
BOOST_CHECK (sound_asset);
- BOOST_CHECK
(sound_asset->mxf()->channels () ==
6);
+ BOOST_CHECK
_EQUAL (sound_asset->asset()->channels (),
6);
/* Sample index in the DCP */
int n = 0;
/* DCP sound asset frame */
int frame = 0;
/* Sample index in the DCP */
int n = 0;
/* DCP sound asset frame */
int frame = 0;
- 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())) {
- if (sound_asset->mxf()->channels() > 0) {
+ for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
+
+ if (sound_asset->asset()->channels() > 0) {
/* L should be silent */
int const sample = d[i + 0] | (d[i + 1] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
/* L should be silent */
int const sample = d[i + 0] | (d[i + 1] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
- if (sound_asset->
mxf
()->channels() > 1) {
+ if (sound_asset->
asset
()->channels() > 1) {
/* R should be silent */
int const sample = d[i + 2] | (d[i + 3] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
/* R should be silent */
int const sample = d[i + 2] | (d[i + 3] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
-
- if (sound_asset->
mxf
()->channels() > 2) {
+
+ if (sound_asset->
asset
()->channels() > 2) {
/* Mono input so it will appear on centre */
int const sample = d[i + 7] | (d[i + 8] << 8);
BOOST_CHECK_EQUAL (sample, n);
}
/* Mono input so it will appear on centre */
int const sample = d[i + 7] | (d[i + 8] << 8);
BOOST_CHECK_EQUAL (sample, n);
}
- if (sound_asset->
mxf
()->channels() > 3) {
+ if (sound_asset->
asset
()->channels() > 3) {
/* Lfe should be silent */
int const sample = d[i + 9] | (d[i + 10] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
/* Lfe should be silent */
int const sample = d[i + 9] | (d[i + 10] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
- if (sound_asset->
mxf
()->channels() > 4) {
+ if (sound_asset->
asset
()->channels() > 4) {
/* Ls should be silent */
int const sample = d[i + 11] | (d[i + 12] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
/* Ls should be silent */
int const sample = d[i + 11] | (d[i + 12] << 8);
BOOST_CHECK_EQUAL (sample, 0);
}
- if (sound_asset->
mxf
()->channels() > 5) {
+ if (sound_asset->
asset
()->channels() > 5) {
/* Rs should be silent */
int const sample = d[i + 13] | (d[i + 14] << 8);
BOOST_CHECK_EQUAL (sample, 0);
/* Rs should be silent */
int const sample = d[i + 13] | (d[i + 14] << 8);
BOOST_CHECK_EQUAL (sample, 0);