Use 64-byte alignment for aligned image memory.

[dcpomatic.git] / test / vf_test.cc

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 915ca5c8c7f98a6fb513c8bb3f712587217187cf..e0d328447081846ef13aa1f978abfdb31729635d 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -75,13 +75,11 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);
        BOOST_REQUIRE (!wait_for_jobs());
+       BOOST_CHECK (!other->audio);
 
-       /* Not possible if there is overlap */
+       /* Not possible if there is overlap; we only check video here as that's all test.mp4 has */
        other->set_position (film, DCPTime());
        BOOST_CHECK (!dcp->can_reference_video(film, why_not));
-       BOOST_CHECK (!dcp->can_reference_audio(film, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not));
 
        /* This should not be considered an overlap */
        other->set_position (film, dcp->end(film));
@@ -129,8 +127,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
        string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -139,8 +137,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
@@ -186,8 +184,8 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
@@ -236,8 +234,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
        string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -246,8 +244,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound());
@@ -289,9 +287,9 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        BOOST_REQUIRE (!wait_for_jobs());
 
        /* Check that the selected reel assets are right */
-       shared_ptr<Player> player (new Player(vf, vf->playlist()));
+       shared_ptr<Player> player (new Player(vf));
        list<ReferencedReelAsset> a = player->get_reel_assets();
-       BOOST_REQUIRE_EQUAL (a.size(), 4);
+       BOOST_REQUIRE_EQUAL (a.size(), 4U);
        list<ReferencedReelAsset>::const_iterator i = a.begin();
        BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
        ++i;