#include "job_manager.h"
#include "util.h"
#include "exceptions.h"
-#include "delay_line.h"
#include "image.h"
#include "log.h"
#include "dcp_video_frame.h"
}
}
-shared_ptr<AudioBuffers> trimmer_test_last;
+shared_ptr<const Image> trimmer_test_last_video;
+shared_ptr<const AudioBuffers> trimmer_test_last_audio;
void
-trimmer_test_helper (shared_ptr<AudioBuffers> audio)
+trimmer_test_video_helper (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>)
{
- trimmer_test_last = audio;
+ trimmer_test_last_video = image;
}
+void
+trimmer_test_audio_helper (shared_ptr<const AudioBuffers> audio)
+{
+ trimmer_test_last_audio = audio;
+}
+
+BOOST_AUTO_TEST_CASE (trimmer_passthrough_test)
+{
+ Trimmer trimmer (shared_ptr<Log> (), 0, 0, 200, 48000, 25, 25);
+ trimmer.Video.connect (bind (&trimmer_test_video_helper, _1, _2, _3));
+ trimmer.Audio.connect (bind (&trimmer_test_audio_helper, _1));
+
+ shared_ptr<SimpleImage> video (new SimpleImage (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+ shared_ptr<AudioBuffers> audio (new AudioBuffers (6, 42 * 1920));
+
+ trimmer.process_video (video, false, shared_ptr<Subtitle> ());
+ trimmer.process_audio (audio);
+
+ BOOST_CHECK_EQUAL (video.get(), trimmer_test_last_video.get());
+ BOOST_CHECK_EQUAL (audio.get(), trimmer_test_last_audio.get());
+ BOOST_CHECK_EQUAL (audio->frames(), trimmer_test_last_audio->frames());
+}
+
+
/** Test the audio handling of the Trimmer */
-BOOST_AUTO_TEST_CASE (trimmer_test)
+BOOST_AUTO_TEST_CASE (trimmer_audio_test)
{
Trimmer trimmer (shared_ptr<Log> (), 25, 75, 200, 48000, 25, 25);
- trimmer.Audio.connect (bind (&trimmer_test_helper, _1));
+ trimmer.Audio.connect (bind (&trimmer_test_audio_helper, _1));
/* 21 video frames-worth of audio frames; should be completely stripped */
- trimmer_test_last.reset ();
+ trimmer_test_last_audio.reset ();
shared_ptr<AudioBuffers> audio (new AudioBuffers (6, 21 * 1920));
trimmer.process_audio (audio);
- BOOST_CHECK (trimmer_test_last == 0);
+ BOOST_CHECK (trimmer_test_last_audio == 0);
/* 42 more video frames-worth, 4 should be stripped from the start */
audio.reset (new AudioBuffers (6, 42 * 1920));
trimmer.process_audio (audio);
- BOOST_CHECK (trimmer_test_last);
- BOOST_CHECK_EQUAL (trimmer_test_last->frames(), 38 * 1920);
+ BOOST_CHECK (trimmer_test_last_audio);
+ BOOST_CHECK_EQUAL (trimmer_test_last_audio->frames(), 38 * 1920);
/* 42 more video frames-worth, should be kept as-is */
- trimmer_test_last.reset ();
+ trimmer_test_last_audio.reset ();
audio.reset (new AudioBuffers (6, 42 * 1920));
trimmer.process_audio (audio);
- BOOST_CHECK (trimmer_test_last);
- BOOST_CHECK_EQUAL (trimmer_test_last->frames(), 42 * 1920);
+ BOOST_CHECK (trimmer_test_last_audio);
+ BOOST_CHECK_EQUAL (trimmer_test_last_audio->frames(), 42 * 1920);
/* 25 more video frames-worth, 5 should be trimmed from the end */
- trimmer_test_last.reset ();
+ trimmer_test_last_audio.reset ();
audio.reset (new AudioBuffers (6, 25 * 1920));
trimmer.process_audio (audio);
- BOOST_CHECK (trimmer_test_last);
- BOOST_CHECK_EQUAL (trimmer_test_last->frames(), 20 * 1920);
+ BOOST_CHECK (trimmer_test_last_audio);
+ BOOST_CHECK_EQUAL (trimmer_test_last_audio->frames(), 20 * 1920);
/* Now some more; all should be trimmed */
- trimmer_test_last.reset ();
+ trimmer_test_last_audio.reset ();
audio.reset (new AudioBuffers (6, 100 * 1920));
trimmer.process_audio (audio);
- BOOST_CHECK (trimmer_test_last == 0);
+ BOOST_CHECK (trimmer_test_last_audio == 0);
}
Format const * f = Format::from_nickname ("Flat");
BOOST_CHECK (f);
-// BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 185);
+ BOOST_CHECK_EQUAL (f->dcp_size().width, 1998);
+ BOOST_CHECK_EQUAL (f->dcp_size().height, 1080);
f = Format::from_nickname ("Scope");
BOOST_CHECK (f);
-// BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 239);
+ BOOST_CHECK_EQUAL (f->dcp_size().width, 2048);
+ BOOST_CHECK_EQUAL (f->dcp_size().height, 858);
}
BOOST_AUTO_TEST_CASE (util_test)
void do_log (string) {}
};
-void
-do_positive_delay_line_test (int delay_length, int data_length)
-{
- shared_ptr<NullLog> log (new NullLog);
-
- DelayLine d (log, 6, delay_length);
- shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
-
- int in = 0;
- int out = 0;
- int returned = 0;
- int zeros = 0;
-
- for (int i = 0; i < 64; ++i) {
- for (int j = 0; j < data_length; ++j) {
- for (int c = 0; c < 6; ++c ) {
- data->data(c)[j] = in;
- ++in;
- }
- }
-
- /* This only works because the delay line modifies the parameter */
- d.process_audio (data);
- returned += data->frames ();
-
- for (int j = 0; j < data->frames(); ++j) {
- if (zeros < delay_length) {
- for (int c = 0; c < 6; ++c) {
- BOOST_CHECK_EQUAL (data->data(c)[j], 0);
- }
- ++zeros;
- } else {
- for (int c = 0; c < 6; ++c) {
- BOOST_CHECK_EQUAL (data->data(c)[j], out);
- ++out;
- }
- }
- }
- }
-
- BOOST_CHECK_EQUAL (returned, 64 * data_length);
-}
-
-void
-do_negative_delay_line_test (int delay_length, int data_length)
-{
- shared_ptr<NullLog> log (new NullLog);
-
- DelayLine d (log, 6, delay_length);
- shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
-
- int in = 0;
- int out = -delay_length * 6;
- int returned = 0;
-
- for (int i = 0; i < 256; ++i) {
- 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;
- }
- }
-
- /* This only works because the delay line modifies the parameter */
- d.process_audio (data);
- returned += data->frames ();
-
- for (int j = 0; j < data->frames(); ++j) {
- for (int c = 0; c < 6; ++c) {
- BOOST_CHECK_EQUAL (data->data(c)[j], out);
- ++out;
- }
- }
- }
-
- returned += -delay_length;
- BOOST_CHECK_EQUAL (returned, 256 * data_length);
-}
-
-BOOST_AUTO_TEST_CASE (delay_line_test)
-{
- do_positive_delay_line_test (64, 128);
- do_positive_delay_line_test (128, 64);
- do_positive_delay_line_test (3, 512);
- do_positive_delay_line_test (512, 3);
-
- do_positive_delay_line_test (0, 64);
-
- do_negative_delay_line_test (-64, 128);
- do_negative_delay_line_test (-128, 64);
- do_negative_delay_line_test (-3, 512);
- do_negative_delay_line_test (-512, 3);
-}
-
BOOST_AUTO_TEST_CASE (md5_digest_test)
{
string const t = md5_digest ("test/md5.test");