Fix variable format ratio under crop (part of #113).

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index b2af8ab22d25b6e4004bbc9abbb0f8a93af0d965..d1bb400f98f2d557946b0032656264046c632972 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -39,7 +39,7 @@
 #include "subtitle.h"
 #include "scaler.h"
 #include "ffmpeg_decoder.h"
-#include "external_audio_decoder.h"
+#include "sndfile_decoder.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dvdomatic_test
 #include <boost/test/unit_test.hpp>
@@ -102,6 +102,7 @@ BOOST_AUTO_TEST_CASE (make_black_test)
        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<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
@@ -191,7 +192,7 @@ BOOST_AUTO_TEST_CASE (stream_test)
        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));
+       SndfileStream 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");
@@ -228,6 +229,32 @@ BOOST_AUTO_TEST_CASE (format_test)
        BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 239);
 }
 
+/* Test VariableFormat-based scaling of content */
+BOOST_AUTO_TEST_CASE (scaling_test)
+{
+       shared_ptr<Film> 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)
 {
        string t = "Hello this is a string \"with quotes\" and indeed without them";
@@ -254,9 +281,9 @@ public:
 void
 do_positive_delay_line_test (int delay_length, int data_length)
 {
-       NullLog log;
+       shared_ptr<NullLog> log (new NullLog);
        
-       DelayLine d (&log, 6, delay_length);
+       DelayLine d (log, 6, delay_length);
        shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
 
        int in = 0;
@@ -273,8 +300,7 @@ do_positive_delay_line_test (int delay_length, int data_length)
                }
 
                /* This only works because the delay line modifies the parameter */
-               /* XXX: timestamp is wrong */
-               d.process_audio (data, 0);
+               d.process_audio (data);
                returned += data->frames ();
 
                for (int j = 0; j < data->frames(); ++j) {
@@ -298,9 +324,9 @@ do_positive_delay_line_test (int delay_length, int data_length)
 void
 do_negative_delay_line_test (int delay_length, int data_length)
 {
-       NullLog log;
+       shared_ptr<NullLog> log (new NullLog);
 
-       DelayLine d (&log, 6, delay_length);
+       DelayLine d (log, 6, delay_length);
        shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
 
        int in = 0;
@@ -317,8 +343,7 @@ do_negative_delay_line_test (int delay_length, int data_length)
                }
 
                /* This only works because the delay line modifies the parameter */
-               /* XXX: timestamp is wrong */
-               d.process_audio (data, 0);
+               d.process_audio (data);
                returned += data->frames ();
 
                for (int j = 0; j < data->frames(); ++j) {
@@ -408,7 +433,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 
        shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image));
 
-       FileLog log ("build/test/client_server_test.log");
+       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
        shared_ptr<DCPVideoFrame> frame (
                new DCPVideoFrame (
@@ -424,14 +449,14 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                        "",
                        0,
                        200000000,
-                       &log
+                       log
                        )
                );
 
        shared_ptr<EncodedData> 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));