projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/data updates.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index acb4acaf8c58c73c87aa2b4f6c7a9240b58b28be..317b455205042ed80b58fb5a725ebe4248d46d6d 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
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,8
+17,12
@@
*/
*/
+/** @file test/recover_test.cc
+ * @brief Test recovery of a DCP transcode after a crash.
+ */
+
#include <boost/test/unit_test.hpp>
#include <boost/test/unit_test.hpp>
-#include <dcp/stereo_picture_
mxf
.h>
+#include <dcp/stereo_picture_
asset
.h>
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
@@
-30,16
+34,17
@@
using std::string;
using boost::shared_ptr;
static void
using boost::shared_ptr;
static void
-note (dcp::NoteType, string n)
+note (dcp::NoteType
t
, string n)
{
{
- cout << n << "\n";
+ if (t == dcp::DCP_ERROR) {
+ cout << n << "\n";
+ }
}
}
-/** Test recovery of a DCP transcode after a crash */
BOOST_AUTO_TEST_CASE (recover_test)
{
shared_ptr<Film> film = new_test_film ("recover_test");
BOOST_AUTO_TEST_CASE (recover_test)
{
shared_ptr<Film> film = new_test_film ("recover_test");
- 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 ("recover_test");
film->set_three_d (true);
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_three_d (true);
@@
-52,7
+57,7
@@
BOOST_AUTO_TEST_CASE (recover_test)
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
aa7e8a4665281568bbe11645a3d4ba4e_24_bicubic_2
00000000_P_S_3D.mxf";
+ boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
40c62abb30c0c1185678d71d58674459_24_1
00000000_P_S_3D.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,
@@
-64,10
+69,9
@@
BOOST_AUTO_TEST_CASE (recover_test)
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- shared_ptr<dcp::StereoPicture
MXF> A (new dcp::StereoPictureMXF
("build/test/recover_test/original.mxf"));
- shared_ptr<dcp::StereoPicture
MXF> B (new dcp::StereoPictureMXF
(video));
+ shared_ptr<dcp::StereoPicture
Asset> A (new dcp::StereoPictureAsset
("build/test/recover_test/original.mxf"));
+ shared_ptr<dcp::StereoPicture
Asset> B (new dcp::StereoPictureAsset
(video));
dcp::EqualityOptions eq;
dcp::EqualityOptions eq;
- eq.mxf_names_can_differ = true;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}