projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
test
/
isdcf_name_test.cc
diff --git
a/test/isdcf_name_test.cc
b/test/isdcf_name_test.cc
index b54ce205fdb0df2e0d74b7c3b3ab39573c94c4ec..bb47fa9c0134e0e4061a0d5cc16871889b61a93a 100644
(file)
--- a/
test/isdcf_name_test.cc
+++ b/
test/isdcf_name_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
6
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/>.
*/
*/
@@
-22,8
+23,12
@@
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
-#include "lib/sndfile_content.h"
+#include "lib/video_content.h"
+#include "lib/audio_mapping.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/audio_content.h"
#include "test.h"
#include "test.h"
+#include <iostream>
using std::cout;
using boost::shared_ptr;
using std::cout;
using boost::shared_ptr;
@@
-46,7
+51,6
@@
BOOST_AUTO_TEST_CASE (isdcf_name_test)
m.rating = "PG";
m.studio = "ST";
m.facility = "FA";
m.rating = "PG";
m.studio = "ST";
m.facility = "FA";
- m.package_type = "OV";
film->set_isdcf_metadata (m);
film->set_interop (true);
BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_2K_ST_20140704_FA_IOP_OV");
film->set_isdcf_metadata (m);
film->set_interop (true);
BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_2K_ST_20140704_FA_IOP_OV");
@@
-66,29
+70,28
@@
BOOST_AUTO_TEST_CASE (isdcf_name_test)
m.rating = "R";
m.studio = "DI";
m.facility = "PP";
m.rating = "R";
m.studio = "DI";
m.facility = "PP";
- m.package_type = "VF";
film->set_isdcf_metadata (m);
film->set_interop (false);
film->set_isdcf_metadata (m);
film->set_interop (false);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
/* Test interior aspect ratio: shouldn't be shown with trailers */
shared_ptr<ImageContent> content (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (content);
wait_for_jobs ();
/* Test interior aspect ratio: shouldn't be shown with trailers */
shared_ptr<ImageContent> content (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (content);
wait_for_jobs ();
- content->set_scale (VideoContentScale (Ratio::from_id ("133")));
+ content->
video->
set_scale (VideoContentScale (Ratio::from_id ("133")));
film->set_container (Ratio::from_id ("185"));
film->set_container (Ratio::from_id ("185"));
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
/* But should be shown for anything else */
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
/* But should be shown for anything else */
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
-
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
+
/* Test 3D */
film->set_three_d (true);
/* Test 3D */
film->set_three_d (true);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE-3D_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE-3D_OV
");
/* Test content type modifiers */
/* Test content type modifiers */
@@
-101,7
+104,7
@@
BOOST_AUTO_TEST_CASE (isdcf_name_test)
m.mastered_luminance = "4fl";
film->set_isdcf_metadata (m);
film->set_video_frame_rate (48);
m.mastered_luminance = "4fl";
film->set_isdcf_metadata (m);
film->set_video_frame_rate (48);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
/* Test a name which is already in camelCase */
/* Test a name which is already in camelCase */
@@
-115,48
+118,46
@@
BOOST_AUTO_TEST_CASE (isdcf_name_test)
film->set_isdcf_metadata (m);
film->set_video_frame_rate (24);
film->set_name ("IKnowCamels");
film->set_isdcf_metadata (m);
film->set_video_frame_rate (24);
film->set_name ("IKnowCamels");
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
/* And one in capitals */
film->set_name ("LIKE SHOUTING");
/* And one in capitals */
film->set_name ("LIKE SHOUTING");
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_4K_DI_20140704_PP_SMPTE_OV
");
/* Test audio channel markup */
/* Test audio channel markup */
-
+
film->set_audio_channels (6);
film->set_audio_channels (6);
- shared_ptr<
SndfileContent> sound (new Sndfile
Content (film, "test/data/sine_440.wav"));
+ shared_ptr<
FFmpegContent> sound (new FFmpeg
Content (film, "test/data/sine_440.wav"));
film->examine_and_add_content (sound);
wait_for_jobs ();
film->examine_and_add_content (sound);
wait_for_jobs ();
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF
");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_10_4K_DI_20140704_PP_SMPTE_OV
");
- AudioMapping mapping = sound->audio
_
mapping ();
+ AudioMapping mapping = sound->audio
->
mapping ();
mapping.set (0, dcp::LEFT, 1.0);
mapping.set (0, dcp::LEFT, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_20_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_20_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::RIGHT, 1.0);
mapping.set (0, dcp::RIGHT, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_30_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_30_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::LFE, 1.0);
mapping.set (0, dcp::LFE, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_31_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_31_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::LS, 1.0);
mapping.set (0, dcp::LS, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_41_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_41_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::RS, 1.0);
mapping.set (0, dcp::RS, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_51_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::HI, 1.0);
mapping.set (0, dcp::HI, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_51_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV
");
film->set_audio_channels (8);
mapping.set (0, dcp::HI, 1.0);
film->set_audio_channels (8);
mapping.set (0, dcp::HI, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_61_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_61_4K_DI_20140704_PP_SMPTE_OV
");
mapping.set (0, dcp::VI, 1.0);
mapping.set (0, dcp::VI, 1.0);
- sound->
set_audio
_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
FR_US-R_71_4K_DI_20140704_PP_SMPTE_VF
");
+ sound->
audio->set
_mapping (mapping);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-
fr_US-R_71_4K_DI_20140704_PP_SMPTE_OV
");
}
}
-
-