projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
test
/
video_mxf_content_test.cc
diff --git
a/test/video_mxf_content_test.cc
b/test/video_mxf_content_test.cc
index 1880935b15c07f63a870efd4ba331604f9006bb2..f3766e4afcbe6e731023ee5c669c6a23726b775c 100644
(file)
--- a/
test/video_mxf_content_test.cc
+++ b/
test/video_mxf_content_test.cc
@@
-26,22
+26,19
@@
-#include "lib/film.h"
-#include "lib/video_mxf_content.h"
#include "lib/content_factory.h"
#include "lib/dcp_content_type.h"
#include "lib/content_factory.h"
#include "lib/dcp_content_type.h"
+#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/ratio.h"
+#include "lib/video_mxf_content.h"
#include "test.h"
#include "test.h"
+#include <dcp/equality_options.h>
#include <dcp/mono_picture_asset.h>
#include <boost/test/unit_test.hpp>
#include <dcp/mono_picture_asset.h>
#include <boost/test/unit_test.hpp>
-using std::make_shared;
-using std::shared_ptr;
using std::dynamic_pointer_cast;
using std::dynamic_pointer_cast;
-
-
-static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_74b946f4-1c33-4209-b639-b834de675eac.mxf";
+using std::make_shared;
static void note (dcp::NoteType, std::string)
static void note (dcp::NoteType, std::string)
@@
-58,7
+55,9
@@
BOOST_AUTO_TEST_CASE (video_mxf_content_test)
film->set_container (Ratio::from_id ("185"));
film->set_name ("video_mxf_content_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("video_mxf_content_test");
- auto content = content_factory(ref_mxf).front();
+ auto const ref_mxf = find_file("test/data/scaling_test_185_185", "j2c");
+
+ auto content = content_factory(ref_mxf)[0];
auto check = dynamic_pointer_cast<VideoMXFContent> (content);
BOOST_REQUIRE (check);
film->examine_and_add_content (content);
auto check = dynamic_pointer_cast<VideoMXFContent> (content);
BOOST_REQUIRE (check);
film->examine_and_add_content (content);