#include "job_manager.h"
#include "util.h"
#include "exceptions.h"
-#include "dvd.h"
#include "delay_line.h"
#include "image.h"
#include "log.h"
#include "cross.h"
#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 <boost/test/unit_test.hpp>
-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_server_port (61920);
}
+shared_ptr<Film>
+new_test_film (string name)
+{
+ string const d = String::compose ("build/test/%1", name);
+ if (boost::filesystem::exists (d)) {
+ boost::filesystem::remove_all (d);
+ }
+ return shared_ptr<Film> (new Film (d, false));
+}
+
BOOST_AUTO_TEST_CASE (film_metadata_test)
{
dvdomatic_setup ();
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<Film> 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<Filter const *> 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_trim_start (42);
+ f->set_dcp_trim_end (99);
+ 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<Film> 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<Filter const *> 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<Filter const *> 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_trim_start(), 42);
+ BOOST_CHECK_EQUAL (g->dcp_trim_end(), 99);
+ BOOST_CHECK_EQUAL (g->dcp_ab(), true);
- g.write_metadata ();
+ g->write_metadata ();
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<int> (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<int> (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<int> (1));
+ BOOST_CHECK_EQUAL (s.id(), 5);
+ BOOST_CHECK_EQUAL (s.name(), "a b c");
+
+ shared_ptr<AudioStream> ff = audio_stream_factory ("ffmpeg 4 44100 1 hello there world", boost::optional<int> (1));
+ shared_ptr<FFmpegAudioStream> cff = dynamic_pointer_cast<FFmpegAudioStream> (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<AudioStream> fe = audio_stream_factory ("external 44100 1", boost::optional<int> (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 ();
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<const Film> ()), 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<const Film> ()), 239);
}
BOOST_AUTO_TEST_CASE (util_test)
BOOST_CHECK_EQUAL (*i++, "them");
}
-BOOST_AUTO_TEST_CASE (dvd_test)
+class NullLog : public Log
{
- list<DVDTitle> const t = dvd_titles ("test/dvd");
- BOOST_CHECK_EQUAL (t.size(), 3);
- list<DVDTitle>::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<AudioBuffers> data (new AudioBuffers (6, data_length));
int in = 0;
int out = 0;
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<AudioBuffers> 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)
BOOST_AUTO_TEST_CASE (paths_test)
{
- FilmState s;
- s.set_directory ("build/test/a/b/c/d/e");
- vector<int> thumbs;
+ shared_ptr<Film> f = new_test_film ("paths_test");
+ f->set_directory ("build/test/a/b/c/d/e");
+ vector<SourceFrame> thumbs;
thumbs.push_back (42);
- s.set_thumbs (thumbs);
- BOOST_CHECK_EQUAL (s.thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.png");
+ f->set_thumbs (thumbs);
+ BOOST_CHECK_EQUAL (f->thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.png");
- 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");
+ 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
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_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> 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 (true);
while (JobManager::instance()->work_to_do ()) {
dvdomatic_sleep (1);
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_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);
+ shared_ptr<Film> 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_dcp_trim_end (42);
+ film->make_dcp (true);
while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
dvdomatic_sleep (1);
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
{
- FilmState fs;
- fs.set_frames_per_second (24);
+ shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test");
+ f->set_frames_per_second (24);
- fs.set_audio_sample_rate (48000);
- BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000);
+ f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+ BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
- fs.set_audio_sample_rate (44100);
- BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000);
+ f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
+ BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
- fs.set_audio_sample_rate (80000);
- BOOST_CHECK_EQUAL (fs.target_sample_rate(), 96000);
+ f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
+ BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
- fs.set_frames_per_second (23.976);
- fs.set_audio_sample_rate (48000);
- BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952);
+ f->set_frames_per_second (23.976);
+ f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+ BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
- fs.set_frames_per_second (29.97);
- fs.set_audio_sample_rate (48000);
- BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952);
+ f->set_frames_per_second (29.97);
+ f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+ BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
}
class TestJob : public Job
{
public:
- TestJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
- : Job (s, o, l, req)
+ TestJob (shared_ptr<Film> f, shared_ptr<Job> req)
+ : Job (f, req)
{
}
BOOST_AUTO_TEST_CASE (job_manager_test)
{
- shared_ptr<const FilmState> s;
- shared_ptr<const Options> o;
- FileLog log ("build/test/job_manager_test.log");
+ shared_ptr<Film> f;
/* Single job, no dependency */
- shared_ptr<TestJob> a (new TestJob (s, o, &log, shared_ptr<Job> ()));
+ shared_ptr<TestJob> a (new TestJob (f, shared_ptr<Job> ()));
JobManager::instance()->add (a);
dvdomatic_sleep (1);
BOOST_CHECK_EQUAL (a->finished_ok(), true);
/* Two jobs, dependency */
- a.reset (new TestJob (s, o, &log, shared_ptr<Job> ()));
- shared_ptr<TestJob> b (new TestJob (s, o, &log, a));
+ a.reset (new TestJob (f, shared_ptr<Job> ()));
+ shared_ptr<TestJob> b (new TestJob (f, a));
JobManager::instance()->add (a);
JobManager::instance()->add (b);
BOOST_CHECK_EQUAL (b->finished_ok(), true);
/* Two jobs, dependency, first fails */
- a.reset (new TestJob (s, o, &log, shared_ptr<Job> ()));
- b.reset (new TestJob (s, o, &log, a));
+ a.reset (new TestJob (f, shared_ptr<Job> ()));
+ b.reset (new TestJob (f, a));
JobManager::instance()->add (a);
JobManager::instance()->add (b);
BOOST_CHECK_EQUAL (a->finished_in_error(), true);
BOOST_CHECK_EQUAL (b->running(), false);
}
+
projects / dcpomatic.git / blobdiff