X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=cf09a7e4aec683baccec078c453abbe28dce454e;hb=8c3eac75cc3717371dce1132bf10093f5ec3a26f;hp=26bca33e5ea33e97e0588049c0d4c6ba32f2a785;hpb=cb33319a820b17a05cfb2ef78ba1799f4d0c54b9;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 26bca33e5..cf09a7e4a 100644 --- a/test/test.cc +++ b/test/test.cc @@ -35,16 +35,34 @@ #include "config.h" #include "server.h" #include "cross.h" +#include "job.h" +#include "subtitle.h" +#include "scaler.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; + +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); +} BOOST_AUTO_TEST_CASE (film_metadata_test) { dvdomatic_setup (); + setup_test_config (); string const test_film = "build/test/film"; @@ -54,48 +72,48 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) BOOST_CHECK_THROW (new Film ("build/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)); + 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_dcp_frames (42); + f->set_dcp_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->dcp_frames(), 42); + BOOST_CHECK_EQUAL (g->dcp_ab(), true); - g.write_metadata (); + g->write_metadata (); BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0); } @@ -105,11 +123,11 @@ 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); } BOOST_AUTO_TEST_CASE (util_test) @@ -244,19 +262,21 @@ BOOST_AUTO_TEST_CASE (md5_digest_test) BOOST_AUTO_TEST_CASE (paths_test) { - FilmState s; - s.directory = "build/test/a/b/c/d/e"; - s.thumbs.push_back (42); - BOOST_CHECK_EQUAL (s.thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.tiff"); - - s.content = "/foo/bar/baz"; - BOOST_CHECK_EQUAL (s.content_path(), "/foo/bar/baz"); - s.content = "foo/bar/baz"; - BOOST_CHECK_EQUAL (s.content_path(), "build/test/a/b/c/d/e/foo/bar/baz"); + shared_ptr f (new Film ("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) +do_remote_encode (shared_ptr frame, ServerDescription* description, shared_ptr locally_encoded, int N) { shared_ptr remotely_encoded; BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); @@ -268,9 +288,7 @@ do_remote_encode (shared_ptr frame, ServerDescription* descriptio BOOST_AUTO_TEST_CASE (client_server_test) { - shared_ptr image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080))); - image->set_line_size (0, 1998 * 3); - + shared_ptr image (new CompactImage (PIX_FMT_RGB24, Size (1998, 1080))); uint8_t* p = image->data()[0]; for (int y = 0; y < 1080; ++y) { @@ -281,13 +299,29 @@ BOOST_AUTO_TEST_CASE (client_server_test) } } + shared_ptr sub_image (new CompactImage (PIX_FMT_RGBA, Size (100, 200))); + p = sub_image->data()[0]; + for (int y = 0; y < 200; ++y) { + for (int x = 0; x < 100; ++x) { + *p++ = y % 256; + *p++ = x % 256; + *p++ = (x + y) % 256; + *p++ = 1; + } + } + + shared_ptr subtitle (new Subtitle (Position (50, 60), sub_image)); + FileLog log ("build/test/client_server_test.log"); shared_ptr frame ( new DCPVideoFrame ( image, + subtitle, Size (1998, 1080), 0, + 0, + 1, Scaler::from_id ("bicubic"), 0, 24, @@ -299,22 +333,29 @@ BOOST_AUTO_TEST_CASE (client_server_test) ); shared_ptr locally_encoded = frame->encode_locally (); + BOOST_ASSERT (locally_encoded); - Config::instance()->set_server_port (61920); Server* server = new Server (&log); new thread (boost::bind (&Server::run, server, 2)); + /* Let the server get itself ready */ + dvdomatic_sleep (1); + ServerDescription description ("localhost", 2); list threads; for (int i = 0; i < 8; ++i) { - threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded))); + threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded, i))); } for (list::iterator i = threads.begin(); i != threads.end(); ++i) { (*i)->join (); } + + for (list::iterator i = threads.begin(); i != threads.end(); ++i) { + delete *i; + } } BOOST_AUTO_TEST_CASE (make_dcp_test) @@ -325,13 +366,12 @@ BOOST_AUTO_TEST_CASE (make_dcp_test) boost::filesystem::remove_all (test_film); } - Film film (test_film, false); - film.set_name ("test_film"); - 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.make_dcp (true); + shared_ptr film (new 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); while (JobManager::instance()->work_to_do ()) { dvdomatic_sleep (1); @@ -348,16 +388,16 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test) boost::filesystem::remove_all (test_film); } - Film film (test_film, false); - film.set_name ("test_film"); - 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); - - while (JobManager::instance()->work_to_do ()) { + shared_ptr film (new 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); + + while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) { dvdomatic_sleep (1); } @@ -366,23 +406,113 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test) BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) { - FilmState fs; - fs.frames_per_second = 24; + shared_ptr f (new Film ("build/test/test_film5", false)); + f->set_frames_per_second (24); - fs.audio_sample_rate = 48000; - BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000); + f->set_audio_sample_rate (48000); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); - fs.audio_sample_rate = 44100; - BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000); + f->set_audio_sample_rate (44100); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); - fs.audio_sample_rate = 80000; - BOOST_CHECK_EQUAL (fs.target_sample_rate(), 96000); + f->set_audio_sample_rate (80000); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000); - fs.frames_per_second = 23.976; - fs.audio_sample_rate = 48000; - BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952); + f->set_frames_per_second (23.976); + f->set_audio_sample_rate (48000); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); - fs.frames_per_second = 29.97; - fs.audio_sample_rate = 48000; - BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952); + f->set_frames_per_second (29.97); + f->set_audio_sample_rate (48000); + BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); +} + +class TestJob : public Job +{ +public: + TestJob (shared_ptr f, shared_ptr req) + : Job (f, req) + { + + } + + void set_finished_ok () { + set_state (FINISHED_OK); + } + + void set_finished_error () { + set_state (FINISHED_ERROR); + } + + void run () + { + while (1) { + if (finished ()) { + return; + } + } + } + + string name () const { + return ""; + } +}; + +BOOST_AUTO_TEST_CASE (job_manager_test) +{ + shared_ptr f; + + /* Single job, no dependency */ + shared_ptr a (new TestJob (f, shared_ptr ())); + + JobManager::instance()->add (a); + dvdomatic_sleep (1); + BOOST_CHECK_EQUAL (a->running (), true); + 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 (stream_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"); }