X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=4d25d50f85944fd6162ac5fb1294a53859c3d274;hb=9bdd8cc51942a13e360dde4efc04b3ca417c8b94;hp=55505648df85dbd4b892263c5fdbd0d9a0916433;hpb=bd8fa9a370f1739952c83107352baa08c79d095e;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 55505648d..4d25d50f8 100644 --- a/test/test.cc +++ b/test/test.cc @@ -21,13 +21,13 @@ #include #include #include +#include #include "format.h" #include "film.h" #include "filter.h" #include "job_manager.h" #include "util.h" #include "exceptions.h" -#include "dvd.h" #include "delay_line.h" #include "image.h" #include "log.h" @@ -38,78 +38,149 @@ #include "job.h" #include "subtitle.h" #include "scaler.h" +#include "ffmpeg_decoder.h" +#include "sndfile_decoder.h" +#include "dcp_content_type.h" #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MODULE dvdomatic_test #include -using namespace std; -using namespace boost; +using std::string; +using std::list; +using std::stringstream; +using std::vector; +using boost::shared_ptr; +using boost::thread; +using boost::dynamic_pointer_cast; void setup_test_config () { Config::instance()->set_num_local_encoding_threads (1); - Config::instance()->set_colour_lut_index (0); - Config::instance()->set_j2k_bandwidth (200000000); Config::instance()->set_servers (vector ()); Config::instance()->set_server_port (61920); + Config::instance()->set_default_dci_metadata (DCIMetadata ()); } -BOOST_AUTO_TEST_CASE (film_metadata_test) +boost::filesystem::path +test_film_dir (string name) +{ + boost::filesystem::path p; + p /= "build"; + p /= "test"; + p /= name; + return p; +} + +shared_ptr +new_test_film (string name) +{ + boost::filesystem::path p = test_film_dir (name); + if (boost::filesystem::exists (p)) { + boost::filesystem::remove_all (p); + } + + return shared_ptr (new Film (p.string(), false)); +} + + +/* Check that Image::make_black works, and doesn't use values which crash + sws_scale(). +*/ +BOOST_AUTO_TEST_CASE (make_black_test) { + /* This needs to happen in the first test */ dvdomatic_setup (); + + libdcp::Size in_size (512, 512); + libdcp::Size out_size (1024, 1024); + + list pix_fmts; + pix_fmts.push_back (AV_PIX_FMT_RGB24); + pix_fmts.push_back (AV_PIX_FMT_YUV420P); + pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P9BE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE); + pix_fmts.push_back (AV_PIX_FMT_UYVY422); + + int N = 0; + for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { + boost::shared_ptr foo (new SimpleImage (*i, in_size, true)); + foo->make_black (); + boost::shared_ptr bar = foo->scale_and_convert_to_rgb (out_size, 0, Scaler::from_id ("bicubic"), true); + + uint8_t* p = bar->data()[0]; + for (int y = 0; y < bar->size().height; ++y) { + uint8_t* q = p; + for (int x = 0; x < bar->line_size()[0]; ++x) { + BOOST_CHECK_EQUAL (*q++, 0); + } + p += bar->stride()[0]; + } + + ++N; + } +} + +BOOST_AUTO_TEST_CASE (film_metadata_test) +{ setup_test_config (); - - string const test_film = "build/test/film"; + + string const test_film = "build/test/film_metadata_test"; if (boost::filesystem::exists (test_film)) { boost::filesystem::remove_all (test_film); } - BOOST_CHECK_THROW (new Film ("build/test/film", true), OpenFileError); + BOOST_CHECK_THROW (new Film (test_film, true), OpenFileError); - Film f (test_film, false); - BOOST_CHECK (f.format() == 0); - BOOST_CHECK (f.dcp_content_type() == 0); - BOOST_CHECK (f.filters ().empty()); - - f.set_name ("fred"); - BOOST_CHECK_THROW (f.set_content ("jim"), OpenFileError); - f.set_dcp_content_type (DCPContentType::from_pretty_name ("Short")); - f.set_format (Format::from_nickname ("Flat")); - f.set_left_crop (1); - f.set_right_crop (2); - f.set_top_crop (3); - f.set_bottom_crop (4); + shared_ptr f (new Film (test_film, false)); + f->_dci_date = boost::gregorian::from_undelimited_string ("20130211"); + BOOST_CHECK (f->format() == 0); + BOOST_CHECK (f->dcp_content_type() == 0); + BOOST_CHECK (f->filters ().empty()); + + f->set_name ("fred"); +// BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError); + f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short")); + f->set_format (Format::from_nickname ("Flat")); + f->set_left_crop (1); + f->set_right_crop (2); + f->set_top_crop (3); + f->set_bottom_crop (4); vector f_filters; f_filters.push_back (Filter::from_id ("pphb")); f_filters.push_back (Filter::from_id ("unsharp")); - f.set_filters (f_filters); - f.set_dcp_frames (42); - f.set_dcp_ab (true); - f.write_metadata (); + f->set_filters (f_filters); + f->set_trim_start (42); + f->set_trim_end (99); + f->set_ab (true); + f->write_metadata (); stringstream s; s << "diff -u test/metadata.ref " << test_film << "/metadata"; BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0); - Film g (test_film, true); + shared_ptr g (new Film (test_film, true)); - BOOST_CHECK_EQUAL (g.name(), "fred"); - BOOST_CHECK_EQUAL (g.dcp_content_type(), DCPContentType::from_pretty_name ("Short")); - BOOST_CHECK_EQUAL (g.format(), Format::from_nickname ("Flat")); - BOOST_CHECK_EQUAL (g.crop().left, 1); - BOOST_CHECK_EQUAL (g.crop().right, 2); - BOOST_CHECK_EQUAL (g.crop().top, 3); - BOOST_CHECK_EQUAL (g.crop().bottom, 4); - vector g_filters = g.filters (); + BOOST_CHECK_EQUAL (g->name(), "fred"); + BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short")); + BOOST_CHECK_EQUAL (g->format(), Format::from_nickname ("Flat")); + BOOST_CHECK_EQUAL (g->crop().left, 1); + BOOST_CHECK_EQUAL (g->crop().right, 2); + BOOST_CHECK_EQUAL (g->crop().top, 3); + BOOST_CHECK_EQUAL (g->crop().bottom, 4); + vector g_filters = g->filters (); BOOST_CHECK_EQUAL (g_filters.size(), 2); BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb")); BOOST_CHECK_EQUAL (g_filters.back(), Filter::from_id ("unsharp")); - BOOST_CHECK_EQUAL (g.dcp_frames(), 42); - BOOST_CHECK_EQUAL (g.dcp_ab(), true); + BOOST_CHECK_EQUAL (g->trim_start(), 42); + BOOST_CHECK_EQUAL (g->trim_end(), 99); + BOOST_CHECK_EQUAL (g->ab(), true); - g.write_metadata (); + g->write_metadata (); BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0); } @@ -119,11 +190,37 @@ BOOST_AUTO_TEST_CASE (format_test) Format const * f = Format::from_nickname ("Flat"); BOOST_CHECK (f); - BOOST_CHECK_EQUAL (f->ratio_as_integer(0), 185); +// BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr ()), 185); f = Format::from_nickname ("Scope"); BOOST_CHECK (f); - BOOST_CHECK_EQUAL (f->ratio_as_integer(0), 239); +// BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr ()), 239); +} + +/* Test VariableFormat-based scaling of content */ +BOOST_AUTO_TEST_CASE (scaling_test) +{ + shared_ptr film (new Film (test_film_dir ("scaling_test").string(), false)); + + /* 4:3 ratio */ + film->set_size (libdcp::Size (320, 240)); + + /* This format should preserve aspect ratio of the source */ + Format const * format = Format::from_id ("var-185"); + + /* We should have enough padding that the result is 4:3, + which would be 1440 pixels. + */ + BOOST_CHECK_EQUAL (format->dcp_padding (film), (1998 - 1440) / 2); + + /* This crops it to 1.291666667 */ + film->set_left_crop (5); + film->set_right_crop (5); + + /* We should now have enough padding that the result is 1.29166667, + which would be 1395 pixels. + */ + BOOST_CHECK_EQUAL (format->dcp_padding (film), rint ((1998 - 1395) / 2.0)); } BOOST_AUTO_TEST_CASE (util_test) @@ -143,29 +240,19 @@ BOOST_AUTO_TEST_CASE (util_test) BOOST_CHECK_EQUAL (*i++, "them"); } -BOOST_AUTO_TEST_CASE (dvd_test) +class NullLog : public Log { - list const t = dvd_titles ("test/dvd"); - BOOST_CHECK_EQUAL (t.size(), 3); - list::const_iterator i = t.begin (); - - BOOST_CHECK_EQUAL (i->number, 1); - BOOST_CHECK_EQUAL (i->size, 0); - ++i; - - BOOST_CHECK_EQUAL (i->number, 2); - BOOST_CHECK_EQUAL (i->size, 14); - ++i; - - BOOST_CHECK_EQUAL (i->number, 3); - BOOST_CHECK_EQUAL (i->size, 7); -} +public: + void do_log (string) {} +}; void -do_positive_delay_line_test (int delay_length, int block_length) +do_positive_delay_line_test (int delay_length, int data_length) { - DelayLine d (delay_length); - uint8_t data[block_length]; + shared_ptr log (new NullLog); + + DelayLine d (log, 6, delay_length); + shared_ptr data (new AudioBuffers (6, data_length)); int in = 0; int out = 0; @@ -173,64 +260,70 @@ do_positive_delay_line_test (int delay_length, int block_length) int zeros = 0; for (int i = 0; i < 64; ++i) { - for (int j = 0; j < block_length; ++j) { - data[j] = in; - ++in; + for (int j = 0; j < data_length; ++j) { + for (int c = 0; c < 6; ++c ) { + data->data(c)[j] = in; + ++in; + } } - int const a = d.feed (data, block_length); - returned += a; + /* This only works because the delay line modifies the parameter */ + d.process_audio (data); + returned += data->frames (); - for (int j = 0; j < a; ++j) { + for (int j = 0; j < data->frames(); ++j) { if (zeros < delay_length) { - BOOST_CHECK_EQUAL (data[j], 0); + for (int c = 0; c < 6; ++c) { + BOOST_CHECK_EQUAL (data->data(c)[j], 0); + } ++zeros; } else { - BOOST_CHECK_EQUAL (data[j], out & 0xff); - ++out; + for (int c = 0; c < 6; ++c) { + BOOST_CHECK_EQUAL (data->data(c)[j], out); + ++out; + } } } } - BOOST_CHECK_EQUAL (returned, 64 * block_length); + BOOST_CHECK_EQUAL (returned, 64 * data_length); } void -do_negative_delay_line_test (int delay_length, int block_length) +do_negative_delay_line_test (int delay_length, int data_length) { - DelayLine d (delay_length); - uint8_t data[block_length]; + shared_ptr log (new NullLog); + + DelayLine d (log, 6, delay_length); + shared_ptr data (new AudioBuffers (6, data_length)); int in = 0; - int out = -delay_length; + int out = -delay_length * 6; int returned = 0; for (int i = 0; i < 256; ++i) { - for (int j = 0; j < block_length; ++j) { - data[j] = in; - ++in; + data->set_frames (data_length); + for (int j = 0; j < data_length; ++j) { + for (int c = 0; c < 6; ++c) { + data->data(c)[j] = in; + ++in; + } } - int const a = d.feed (data, block_length); - returned += a; + /* This only works because the delay line modifies the parameter */ + d.process_audio (data); + returned += data->frames (); - for (int j = 0; j < a; ++j) { - BOOST_CHECK_EQUAL (data[j], out & 0xff); - ++out; + for (int j = 0; j < data->frames(); ++j) { + for (int c = 0; c < 6; ++c) { + BOOST_CHECK_EQUAL (data->data(c)[j], out); + ++out; + } } } - uint8_t remainder[-delay_length]; - d.get_remaining (remainder); returned += -delay_length; - - for (int i = 0; i < -delay_length; ++i) { - BOOST_CHECK_EQUAL (remainder[i], 0); - ++out; - } - - BOOST_CHECK_EQUAL (returned, 256 * block_length); - + BOOST_CHECK_EQUAL (returned, 256 * data_length); } BOOST_AUTO_TEST_CASE (delay_line_test) @@ -256,23 +349,8 @@ BOOST_AUTO_TEST_CASE (md5_digest_test) BOOST_CHECK_THROW (md5_digest ("foobar"), OpenFileError); } -BOOST_AUTO_TEST_CASE (paths_test) -{ - Film f ("build/test/film4", false); - f.set_directory ("build/test/a/b/c/d/e"); - vector thumbs; - thumbs.push_back (42); - f.set_thumbs (thumbs); - BOOST_CHECK_EQUAL (f.thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.png"); - - f._content = "/foo/bar/baz"; - BOOST_CHECK_EQUAL (f.content_path(), "/foo/bar/baz"); - f._content = "foo/bar/baz"; - BOOST_CHECK_EQUAL (f.content_path(), "build/test/a/b/c/d/e/foo/bar/baz"); -} - void -do_remote_encode (shared_ptr frame, ServerDescription* description, shared_ptr locally_encoded, int N) +do_remote_encode (shared_ptr frame, ServerDescription* description, shared_ptr locally_encoded) { shared_ptr remotely_encoded; BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); @@ -284,37 +362,41 @@ do_remote_encode (shared_ptr frame, ServerDescription* descriptio BOOST_AUTO_TEST_CASE (client_server_test) { - shared_ptr image (new CompactImage (PIX_FMT_RGB24, Size (1998, 1080))); + shared_ptr image (new SimpleImage (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true)); uint8_t* p = image->data()[0]; for (int y = 0; y < 1080; ++y) { + uint8_t* q = p; for (int x = 0; x < 1998; ++x) { - *p++ = x % 256; - *p++ = y % 256; - *p++ = (x + y) % 256; + *q++ = x % 256; + *q++ = y % 256; + *q++ = (x + y) % 256; } + p += image->stride()[0]; } - shared_ptr sub_image (new CompactImage (PIX_FMT_RGBA, Size (100, 200))); + shared_ptr sub_image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { + uint8_t* q = p; for (int x = 0; x < 100; ++x) { - *p++ = y % 256; - *p++ = x % 256; - *p++ = (x + y) % 256; - *p++ = 1; + *q++ = y % 256; + *q++ = x % 256; + *q++ = (x + y) % 256; + *q++ = 1; } + p += sub_image->stride()[0]; } shared_ptr subtitle (new Subtitle (Position (50, 60), sub_image)); - FileLog log ("build/test/client_server_test.log"); + shared_ptr log (new FileLog ("build/test/client_server_test.log")); shared_ptr frame ( new DCPVideoFrame ( image, subtitle, - Size (1998, 1080), + libdcp::Size (1998, 1080), 0, 0, 1, @@ -324,14 +406,14 @@ BOOST_AUTO_TEST_CASE (client_server_test) "", 0, 200000000, - &log + log ) ); shared_ptr locally_encoded = frame->encode_locally (); BOOST_ASSERT (locally_encoded); - Server* server = new Server (&log); + Server* server = new Server (log); new thread (boost::bind (&Server::run, server, 2)); @@ -342,7 +424,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) list threads; for (int i = 0; i < 8; ++i) { - threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded, i))); + threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded))); } for (list::iterator i = threads.begin(); i != threads.end(); ++i) { @@ -356,18 +438,13 @@ BOOST_AUTO_TEST_CASE (client_server_test) BOOST_AUTO_TEST_CASE (make_dcp_test) { - string const test_film = "build/test/film2"; - - if (boost::filesystem::exists (test_film)) { - boost::filesystem::remove_all (test_film); - } - - Film film (test_film, false); - film.set_name ("test_film2"); - film.set_content ("../../../test/test.mp4"); - film.set_format (Format::from_nickname ("Flat")); - film.set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); - film.make_dcp (true); + shared_ptr film = new_test_film ("make_dcp_test"); + film->set_name ("test_film2"); +// film->set_content ("../../../test/test.mp4"); + film->set_format (Format::from_nickname ("Flat")); + film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->make_dcp (); + film->write_metadata (); while (JobManager::instance()->work_to_do ()) { dvdomatic_sleep (1); @@ -376,22 +453,29 @@ BOOST_AUTO_TEST_CASE (make_dcp_test) BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false); } +/** Test Film::have_dcp(). Requires the output from make_dcp_test above */ +BOOST_AUTO_TEST_CASE (have_dcp_test) +{ + boost::filesystem::path p = test_film_dir ("make_dcp_test"); + Film f (p.string ()); + BOOST_CHECK (f.have_dcp()); + + p /= f.dcp_name(); + p /= "video.mxf"; + boost::filesystem::remove (p); + BOOST_CHECK (!f.have_dcp ()); +} + BOOST_AUTO_TEST_CASE (make_dcp_with_range_test) { - string const test_film = "build/test/film3"; - - if (boost::filesystem::exists (test_film)) { - boost::filesystem::remove_all (test_film); - } - - Film film (test_film, false); - film.set_name ("test_film3"); - film.set_content ("../../../test/test.mp4"); - film.examine_content (); - film.set_format (Format::from_nickname ("Flat")); - film.set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); - film.set_dcp_frames (42); - film.make_dcp (true); + shared_ptr film = new_test_film ("make_dcp_with_range_test"); + film->set_name ("test_film3"); +// film->set_content ("../../../test/test.mp4"); +// film->examine_content (); + film->set_format (Format::from_nickname ("Flat")); + film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_trim_end (42); + film->make_dcp (); while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) { dvdomatic_sleep (1); @@ -400,34 +484,203 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test) BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false); } -BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) +/* Test best_dcp_frame_rate and FrameRateConversion */ +BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test) { - Film f ("build/test/test_film5", false); - f.set_frames_per_second (24); - - f.set_audio_sample_rate (48000); - BOOST_CHECK_EQUAL (f.target_audio_sample_rate(), 48000); - - f.set_audio_sample_rate (44100); - BOOST_CHECK_EQUAL (f.target_audio_sample_rate(), 48000); - - f.set_audio_sample_rate (80000); - BOOST_CHECK_EQUAL (f.target_audio_sample_rate(), 96000); - - f.set_frames_per_second (23.976); - f.set_audio_sample_rate (48000); - BOOST_CHECK_EQUAL (f.target_audio_sample_rate(), 47952); + /* Run some tests with a limited range of allowed rates */ + + std::list afr; + afr.push_back (24); + afr.push_back (25); + afr.push_back (30); + Config::instance()->set_allowed_dcp_frame_rates (afr); + + int best = best_dcp_frame_rate (60); + FrameRateConversion frc = FrameRateConversion (60, best); + BOOST_CHECK_EQUAL (best, 30); + BOOST_CHECK_EQUAL (frc.skip, true); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (50); + frc = FrameRateConversion (50, best); + BOOST_CHECK_EQUAL (best, 25); + BOOST_CHECK_EQUAL (frc.skip, true); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (48); + frc = FrameRateConversion (48, best); + BOOST_CHECK_EQUAL (best, 24); + BOOST_CHECK_EQUAL (frc.skip, true); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (30); + frc = FrameRateConversion (30, best); + BOOST_CHECK_EQUAL (best, 30); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (29.97); + frc = FrameRateConversion (29.97, best); + BOOST_CHECK_EQUAL (best, 30); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, true); + + best = best_dcp_frame_rate (25); + frc = FrameRateConversion (25, best); + BOOST_CHECK_EQUAL (best, 25); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (24); + frc = FrameRateConversion (24, best); + BOOST_CHECK_EQUAL (best, 24); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (14.5); + frc = FrameRateConversion (14.5, best); + BOOST_CHECK_EQUAL (best, 30); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, true); + BOOST_CHECK_EQUAL (frc.change_speed, true); + + best = best_dcp_frame_rate (12.6); + frc = FrameRateConversion (12.6, best); + BOOST_CHECK_EQUAL (best, 25); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, true); + BOOST_CHECK_EQUAL (frc.change_speed, true); + + best = best_dcp_frame_rate (12.4); + frc = FrameRateConversion (12.4, best); + BOOST_CHECK_EQUAL (best, 25); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, true); + BOOST_CHECK_EQUAL (frc.change_speed, true); + + best = best_dcp_frame_rate (12); + frc = FrameRateConversion (12, best); + BOOST_CHECK_EQUAL (best, 24); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, true); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + /* Now add some more rates and see if it will use them + in preference to skip/repeat. + */ + + afr.push_back (48); + afr.push_back (50); + afr.push_back (60); + Config::instance()->set_allowed_dcp_frame_rates (afr); + + best = best_dcp_frame_rate (60); + frc = FrameRateConversion (60, best); + BOOST_CHECK_EQUAL (best, 60); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (50); + frc = FrameRateConversion (50, best); + BOOST_CHECK_EQUAL (best, 50); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + best = best_dcp_frame_rate (48); + frc = FrameRateConversion (48, best); + BOOST_CHECK_EQUAL (best, 48); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, false); + + /* Check some out-there conversions (not the best) */ + + frc = FrameRateConversion (14.99, 24); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, true); + BOOST_CHECK_EQUAL (frc.change_speed, true); + + /* Check some conversions with limited DCP targets */ + + afr.clear (); + afr.push_back (24); + Config::instance()->set_allowed_dcp_frame_rates (afr); + + best = best_dcp_frame_rate (25); + frc = FrameRateConversion (25, best); + BOOST_CHECK_EQUAL (best, 24); + BOOST_CHECK_EQUAL (frc.skip, false); + BOOST_CHECK_EQUAL (frc.repeat, false); + BOOST_CHECK_EQUAL (frc.change_speed, true); +} - f.set_frames_per_second (29.97); - f.set_audio_sample_rate (48000); - BOOST_CHECK_EQUAL (f.target_audio_sample_rate(), 47952); +BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) +{ + std::list afr; + afr.push_back (24); + afr.push_back (25); + afr.push_back (30); + Config::instance()->set_allowed_dcp_frame_rates (afr); + + shared_ptr f = new_test_film ("audio_sampling_rate_test"); +// f->set_source_frame_rate (24); + f->set_dcp_frame_rate (24); + +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); + +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 44100, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); + +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 80000, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000); + +// f->set_source_frame_rate (23.976); + f->set_dcp_frame_rate (best_dcp_frame_rate (23.976)); +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); + +// f->set_source_frame_rate (29.97); + f->set_dcp_frame_rate (best_dcp_frame_rate (29.97)); + BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30); +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); + +// f->set_source_frame_rate (25); + f->set_dcp_frame_rate (24); +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); + +// f->set_source_frame_rate (25); + f->set_dcp_frame_rate (24); +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 44100, 0))); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); + + /* Check some out-there conversions (not the best) */ + +// f->set_source_frame_rate (14.99); + f->set_dcp_frame_rate (25); +// f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 16000, 0))); + /* The FrameRateConversion within target_audio_sample_rate should choose to double-up + the 14.99 fps video to 30 and then run it slow at 25. + */ + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), rint (48000 * 2 * 14.99 / 25)); } class TestJob : public Job { public: - TestJob (shared_ptr f, shared_ptr req) - : Job (f, req) + TestJob (shared_ptr f) + : Job (f) { } @@ -458,8 +711,8 @@ BOOST_AUTO_TEST_CASE (job_manager_test) { shared_ptr f; - /* Single job, no dependency */ - shared_ptr a (new TestJob (f, shared_ptr ())); + /* Single job */ + shared_ptr a (new TestJob (f)); JobManager::instance()->add (a); dvdomatic_sleep (1); @@ -467,48 +720,103 @@ BOOST_AUTO_TEST_CASE (job_manager_test) a->set_finished_ok (); dvdomatic_sleep (2); BOOST_CHECK_EQUAL (a->finished_ok(), true); +} - /* Two jobs, dependency */ - a.reset (new TestJob (f, shared_ptr ())); - shared_ptr b (new TestJob (f, a)); - - JobManager::instance()->add (a); - JobManager::instance()->add (b); - dvdomatic_sleep (2); - BOOST_CHECK_EQUAL (a->running(), true); - BOOST_CHECK_EQUAL (b->running(), false); - a->set_finished_ok (); - dvdomatic_sleep (2); - BOOST_CHECK_EQUAL (a->finished_ok(), true); - BOOST_CHECK_EQUAL (b->running(), true); - b->set_finished_ok (); - dvdomatic_sleep (2); - BOOST_CHECK_EQUAL (b->finished_ok(), true); - - /* Two jobs, dependency, first fails */ - a.reset (new TestJob (f, shared_ptr ())); - b.reset (new TestJob (f, a)); - - JobManager::instance()->add (a); - JobManager::instance()->add (b); - dvdomatic_sleep (2); - BOOST_CHECK_EQUAL (a->running(), true); - BOOST_CHECK_EQUAL (b->running(), false); - a->set_finished_error (); - dvdomatic_sleep (2); - BOOST_CHECK_EQUAL (a->finished_in_error(), true); - BOOST_CHECK_EQUAL (b->running(), false); +BOOST_AUTO_TEST_CASE (compact_image_test) +{ + SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), false); + BOOST_CHECK_EQUAL (s->components(), 1); + BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3); + BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3); + BOOST_CHECK (s->data()[0]); + BOOST_CHECK (!s->data()[1]); + BOOST_CHECK (!s->data()[2]); + BOOST_CHECK (!s->data()[3]); + + /* copy constructor */ + SimpleImage* t = new SimpleImage (*s); + BOOST_CHECK_EQUAL (t->components(), 1); + BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3); + BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3); + BOOST_CHECK (t->data()[0]); + BOOST_CHECK (!t->data()[1]); + BOOST_CHECK (!t->data()[2]); + BOOST_CHECK (!t->data()[3]); + BOOST_CHECK (t->data() != s->data()); + BOOST_CHECK (t->data()[0] != s->data()[0]); + BOOST_CHECK (t->line_size() != s->line_size()); + BOOST_CHECK (t->line_size()[0] == s->line_size()[0]); + BOOST_CHECK (t->stride() != s->stride()); + BOOST_CHECK (t->stride()[0] == s->stride()[0]); + + /* assignment operator */ + SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), true); + *u = *s; + BOOST_CHECK_EQUAL (u->components(), 1); + BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3); + BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3); + BOOST_CHECK (u->data()[0]); + BOOST_CHECK (!u->data()[1]); + BOOST_CHECK (!u->data()[2]); + BOOST_CHECK (!u->data()[3]); + BOOST_CHECK (u->data() != s->data()); + BOOST_CHECK (u->data()[0] != s->data()[0]); + BOOST_CHECK (u->line_size() != s->line_size()); + BOOST_CHECK (u->line_size()[0] == s->line_size()[0]); + BOOST_CHECK (u->stride() != s->stride()); + BOOST_CHECK (u->stride()[0] == s->stride()[0]); + + delete s; + delete t; + delete u; } -BOOST_AUTO_TEST_CASE (stream_test) +BOOST_AUTO_TEST_CASE (aligned_image_test) { - AudioStream a ("4 9 hello there world"); - BOOST_CHECK_EQUAL (a.id(), 4); - BOOST_CHECK_EQUAL (a.channels(), 9); - BOOST_CHECK_EQUAL (a.name(), "hello there world"); - BOOST_CHECK_EQUAL (a.to_string(), "4 9 hello there world"); - - SubtitleStream s ("5 a b c"); - BOOST_CHECK_EQUAL (s.id(), 5); - BOOST_CHECK_EQUAL (s.name(), "a b c"); + SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), true); + BOOST_CHECK_EQUAL (s->components(), 1); + /* 160 is 150 aligned to the nearest 32 bytes */ + BOOST_CHECK_EQUAL (s->stride()[0], 160); + BOOST_CHECK_EQUAL (s->line_size()[0], 150); + BOOST_CHECK (s->data()[0]); + BOOST_CHECK (!s->data()[1]); + BOOST_CHECK (!s->data()[2]); + BOOST_CHECK (!s->data()[3]); + + /* copy constructor */ + SimpleImage* t = new SimpleImage (*s); + BOOST_CHECK_EQUAL (t->components(), 1); + BOOST_CHECK_EQUAL (t->stride()[0], 160); + BOOST_CHECK_EQUAL (t->line_size()[0], 150); + BOOST_CHECK (t->data()[0]); + BOOST_CHECK (!t->data()[1]); + BOOST_CHECK (!t->data()[2]); + BOOST_CHECK (!t->data()[3]); + BOOST_CHECK (t->data() != s->data()); + BOOST_CHECK (t->data()[0] != s->data()[0]); + BOOST_CHECK (t->line_size() != s->line_size()); + BOOST_CHECK (t->line_size()[0] == s->line_size()[0]); + BOOST_CHECK (t->stride() != s->stride()); + BOOST_CHECK (t->stride()[0] == s->stride()[0]); + + /* assignment operator */ + SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), false); + *u = *s; + BOOST_CHECK_EQUAL (u->components(), 1); + BOOST_CHECK_EQUAL (u->stride()[0], 160); + BOOST_CHECK_EQUAL (u->line_size()[0], 150); + BOOST_CHECK (u->data()[0]); + BOOST_CHECK (!u->data()[1]); + BOOST_CHECK (!u->data()[2]); + BOOST_CHECK (!u->data()[3]); + BOOST_CHECK (u->data() != s->data()); + BOOST_CHECK (u->data()[0] != s->data()[0]); + BOOST_CHECK (u->line_size() != s->line_size()); + BOOST_CHECK (u->line_size()[0] == s->line_size()[0]); + BOOST_CHECK (u->stride() != s->stride()); + BOOST_CHECK (u->stride()[0] == s->stride()[0]); + + delete s; + delete t; + delete u; }