projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index 32ad6ca70ae9265ca3463c00e21edcdb96fb7dc3..3ccfd2c35ea84dac9d503b8edc1fe7a4fada9433 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 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,12
+22,6
@@
* @brief Overall test stuff and useful methods for tests.
*/
* @brief Overall test stuff and useful methods for tests.
*/
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
#include "lib/config.h"
#include "lib/util.h"
#include "lib/signal_manager.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/signal_manager.h"
@@
-34,11
+29,20
@@
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
-#include "lib/server_finder.h"
+#include "lib/
encode_
server_finder.h"
#include "lib/image.h"
#include "lib/image.h"
+#include "lib/ratio.h"
+#include "lib/log_entry.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
+#include <iostream>
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-46,6
+50,7
@@
using std::min;
using std::cout;
using std::cerr;
using std::list;
using std::cout;
using std::cerr;
using std::list;
+using std::abs;
using boost::shared_ptr;
using boost::scoped_array;
using boost::shared_ptr;
using boost::scoped_array;
@@
-68,14
+73,15
@@
struct TestConfig
dcpomatic_setup ();
Config::instance()->set_num_local_encoding_threads (1);
dcpomatic_setup ();
Config::instance()->set_num_local_encoding_threads (1);
- Config::instance()->set_server_port_base (6192
0
);
+ Config::instance()->set_server_port_base (6192
1
);
Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
- Config::instance()->set_default_container (
static_cast<Ratio*> (0
));
+ Config::instance()->set_default_container (
Ratio::from_id ("185"
));
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
+ Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
-
ServerFinder::instance()->disable
();
+
EncodeServerFinder::instance()->stop
();
signal_manager = new TestSignalManager ();
}
signal_manager = new TestSignalManager ();
}
@@
-105,10
+111,10
@@
new_test_film (string name)
if (boost::filesystem::exists (p)) {
boost::filesystem::remove_all (p);
}
if (boost::filesystem::exists (p)) {
boost::filesystem::remove_all (p);
}
-
- shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
- f->write_metadata ();
- return f;
+
+ shared_ptr<Film> f
ilm
= shared_ptr<Film> (new Film (p.string()));
+ f
ilm
->write_metadata ();
+ return f
ilm
;
}
void
}
void
@@
-118,7
+124,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
ref_info.format = 0;
SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
BOOST_CHECK (ref_file);
ref_info.format = 0;
SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
BOOST_CHECK (ref_file);
-
+
SF_INFO check_info;
check_info.format = 0;
SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
SF_INFO check_info;
check_info.format = 0;
SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
@@
-133,7
+139,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
sf_count_t const buffer_size = 65536 * ref_info.channels;
scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
sf_count_t const buffer_size = 65536 * ref_info.channels;
scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
-
+
sf_count_t N = ref_info.frames;
while (N) {
sf_count_t this_time = min (buffer_size, N);
sf_count_t N = ref_info.frames;
while (N) {
sf_count_t this_time = min (buffer_size, N);
@@
-143,7
+149,11
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
- BOOST_CHECK (fabs (ref_buffer[i] - check_buffer[i]) <= 65536);
+ BOOST_REQUIRE_MESSAGE (
+ abs (ref_buffer[i] - check_buffer[i]) <= 65536,
+ ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
+ << "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")"
+ );
}
N -= this_time;
}
N -= this_time;
@@
-159,14
+169,14
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
-
+
int const buffer_size = 65536;
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
int const buffer_size = 65536;
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
-
SafeStringS
tream error;
+
locked_strings
tream error;
error << "File " << check.string() << " differs from reference " << ref.string();
error << "File " << check.string() << " differs from reference " << ref.string();
-
+
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
size_t r = fread (ref_buffer, 1, this_time, ref_file);
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
size_t r = fread (ref_buffer, 1, this_time, ref_file);
@@
-178,7
+188,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
-
+
N -= this_time;
}
N -= this_time;
}
@@
-210,9
+220,10
@@
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
options.max_std_dev_pixel_error = 5;
options.max_audio_sample_error = 255;
options.cpl_annotation_texts_can_differ = true;
options.max_std_dev_pixel_error = 5;
options.max_audio_sample_error = 255;
options.cpl_annotation_texts_can_differ = true;
- options.
mxf_filename
s_can_differ = true;
+ options.
reel_annotation_text
s_can_differ = true;
options.reel_hashes_can_differ = true;
options.reel_hashes_can_differ = true;
-
+ options.issue_dates_can_differ = true;
+
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
@@
-280,13
+291,15
@@
check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
check_xml (ref_root, test_root, ignore);
}
check_xml (ref_root, test_root, ignore);
}
-void
+bool
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
- signal_manager->ui_idle ();
+ while (signal_manager->ui_idle ()) {}
+ dcpomatic_sleep (1);
}
}
+
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@
-305,10
+318,14
@@
wait_for_jobs ()
}
}
}
}
- signal_manager->ui_idle ();
+ while (signal_manager->ui_idle ()) {}
+
+ if (jm->errors ()) {
+ JobManager::drop ();
+ return true;
+ }
- /* Discard all jobs so we lose any we just reported an error in */
- JobManager::drop ();
+ return false;
}
void
}
void
@@
-318,7
+335,7
@@
write_image (shared_ptr<const Image> image, boost::filesystem::path file)
using namespace MagickCore;
#else
using namespace MagickLib;
using namespace MagickCore;
#else
using namespace MagickLib;
-#endif
+#endif
Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
m.write (file.string ());
Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
m.write (file.string ());