X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=5f6d687ac506cded67e844a386494333a580c430;hb=be1b34275e14d2584e233ac2a81d3dc44a97c208;hp=a1a8c9cf3a8aafe866c14bea80484b607392363d;hpb=4fb0a5ab9eebc0f07981edc3a6813102520b8233;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index a1a8c9cf3..5f6d687ac 100644 --- a/test/test.cc +++ b/test/test.cc @@ -27,7 +27,6 @@ #include "job_manager.h" #include "util.h" #include "exceptions.h" -#include "dvd.h" #include "delay_line.h" #include "image.h" #include "log.h" @@ -38,6 +37,8 @@ #include "job.h" #include "subtitle.h" #include "scaler.h" +#include "ffmpeg_decoder.h" +#include "external_audio_decoder.h" #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MODULE dvdomatic_test #include @@ -48,13 +49,12 @@ 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); } @@ -129,6 +129,39 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0); } +BOOST_AUTO_TEST_CASE (stream_test) +{ + FFmpegAudioStream a ("ffmpeg 4 44100 1 hello there world", boost::optional (1)); + BOOST_CHECK_EQUAL (a.id(), 4); + BOOST_CHECK_EQUAL (a.sample_rate(), 44100); + BOOST_CHECK_EQUAL (a.channel_layout(), 1); + BOOST_CHECK_EQUAL (a.name(), "hello there world"); + BOOST_CHECK_EQUAL (a.to_string(), "ffmpeg 4 44100 1 hello there world"); + + ExternalAudioStream e ("external 44100 1", boost::optional (1)); + BOOST_CHECK_EQUAL (e.sample_rate(), 44100); + BOOST_CHECK_EQUAL (e.channel_layout(), 1); + BOOST_CHECK_EQUAL (e.to_string(), "external 44100 1"); + + SubtitleStream s ("5 a b c", boost::optional (1)); + BOOST_CHECK_EQUAL (s.id(), 5); + BOOST_CHECK_EQUAL (s.name(), "a b c"); + + shared_ptr ff = audio_stream_factory ("ffmpeg 4 44100 1 hello there world", boost::optional (1)); + shared_ptr cff = dynamic_pointer_cast (ff); + BOOST_CHECK (cff); + BOOST_CHECK_EQUAL (cff->id(), 4); + BOOST_CHECK_EQUAL (cff->sample_rate(), 44100); + BOOST_CHECK_EQUAL (cff->channel_layout(), 1); + BOOST_CHECK_EQUAL (cff->name(), "hello there world"); + BOOST_CHECK_EQUAL (cff->to_string(), "ffmpeg 4 44100 1 hello there world"); + + shared_ptr fe = audio_stream_factory ("external 44100 1", boost::optional (1)); + BOOST_CHECK_EQUAL (fe->sample_rate(), 44100); + BOOST_CHECK_EQUAL (fe->channel_layout(), 1); + BOOST_CHECK_EQUAL (fe->to_string(), "external 44100 1"); +} + BOOST_AUTO_TEST_CASE (format_test) { Format::setup_formats (); @@ -159,29 +192,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]; + NullLog log; + + DelayLine d (&log, 6, delay_length); + shared_ptr data (new AudioBuffers (6, data_length)); int in = 0; int out = 0; @@ -189,64 +212,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]; + NullLog log; + + 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) @@ -276,10 +305,6 @@ BOOST_AUTO_TEST_CASE (paths_test) { shared_ptr f = new_test_film ("paths_test"); 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"); @@ -288,7 +313,7 @@ BOOST_AUTO_TEST_CASE (paths_test) } 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)); @@ -300,7 +325,7 @@ 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), false)); uint8_t* p = image->data()[0]; for (int y = 0; y < 1080; ++y) { @@ -311,7 +336,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) } } - 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), false)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { for (int x = 0; x < 100; ++x) { @@ -330,7 +355,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) new DCPVideoFrame ( image, subtitle, - Size (1998, 1080), + libdcp::Size (1998, 1080), 0, 0, 1, @@ -358,7 +383,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) { @@ -409,21 +434,21 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) shared_ptr f = new_test_film ("audio_sampling_rate_test"); f->set_frames_per_second (24); - f->set_audio_sample_rate (48000); + f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); - f->set_audio_sample_rate (44100); + f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 44100, 0))); BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); - f->set_audio_sample_rate (80000); + f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 80000, 0))); BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000); f->set_frames_per_second (23.976); - f->set_audio_sample_rate (48000); + f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); f->set_frames_per_second (29.97); - f->set_audio_sample_rate (48000); + f->set_content_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); } @@ -504,15 +529,101 @@ BOOST_AUTO_TEST_CASE (job_manager_test) BOOST_CHECK_EQUAL (b->running(), false); } -BOOST_AUTO_TEST_CASE (stream_test) +BOOST_AUTO_TEST_CASE (compact_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"); + 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; +} - SubtitleStream s ("5 a b c"); - BOOST_CHECK_EQUAL (s.id(), 5); - BOOST_CHECK_EQUAL (s.name(), "a b c"); +BOOST_AUTO_TEST_CASE (aligned_image_test) +{ + 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; }