projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a constexpr and a nullptr.
[dcpomatic.git]
/
test
/
threed_test.cc
diff --git
a/test/threed_test.cc
b/test/threed_test.cc
index cda278a59702506a654392aaf3c4d8b8897723fd..f98464fb5810329d20a6a6903ed2b175bc4fb9b6 100644
(file)
--- a/
test/threed_test.cc
+++ b/
test/threed_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,21
+18,24
@@
*/
*/
+
/** @file test/threed_test.cc
* @brief Create some 3D DCPs (without comparing the results to anything).
* @ingroup completedcp
*/
/** @file test/threed_test.cc
* @brief Create some 3D DCPs (without comparing the results to anything).
* @ingroup completedcp
*/
-#include "test.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
+
#include "lib/config.h"
#include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
-#include "lib/video_content.h"
-#include "lib/job_manager.h"
-#include "lib/cross.h"
+#include "lib/film.h"
#include "lib/job.h"
#include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <iostream>
#include <boost/test/unit_test.hpp>
#include <iostream>
@@
-169,12
+172,13
@@
BOOST_AUTO_TEST_CASE (threed_test7)
using boost::filesystem::path;
auto film = new_test_film2 ("threed_test7");
using boost::filesystem::path;
auto film = new_test_film2 ("threed_test7");
- path const content_path = "test/data/
red_24.mp4
";
- auto c =
make_shared<FFmpegContent>(content_path
);
+ path const content_path = "test/data/
flat_red.png
";
+ auto c =
content_factory(content_path).front(
);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_frame_type (VideoFrameType::THREE_D);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_frame_type (VideoFrameType::THREE_D);
+ c->video->set_length (24);
film->set_three_d (true);
film->make_dcp ();
film->set_three_d (true);
film->make_dcp ();