Merge branch 'master' into format-fix

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 448168f241ddc16eebb518e8463c6491e74569cf..4c468e22d86331a55d834f1ad8f322121835a3d5 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");
@@ -221,11 +222,39 @@ BOOST_AUTO_TEST_CASE (format_test)
        
        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);
+}
+
+/* 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)
@@ -477,7 +506,7 @@ BOOST_AUTO_TEST_CASE (have_dcp_test)
        BOOST_CHECK (f.have_dcp());
 
        p /= f.dcp_name();
-       p /= "video.mxf";
+       p /= f.dcp_video_mxf_filename();
        boost::filesystem::remove (p);
        BOOST_CHECK (!f.have_dcp ());
 }