projects / libdcp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Whitespace.
[libdcp.git] / test / dcp_test.cc
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 135887d5b60a8bdfe3c892cd061c204caa2b2b5f..40030f7be8f877db24b535101c2fca3f39ee807f 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -43,19 +43,20 @@
 #include "atmos_asset.h"
 #include "reel.h"
 #include "test.h"
-#include "file.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_atmos_asset.h"
+#include "reel_markers_asset.h"
 #include <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 
 using std::string;
 using std::vector;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::make_shared;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -67,7 +68,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
        RNGFixer fixer;
 
        make_simple("build/test/DCP/dcp_test1")->write_xml(
-               dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+               dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP"
                );
 
        /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
@@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        boost::filesystem::remove_all ("build/test/DCP/dcp_test2");
        boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
        dcp::DCP d ("build/test/DCP/dcp_test2");
-       shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::FEATURE);
        cpl->set_content_version (
                dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
                );
@@ -97,10 +98,10 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
        cpl->set_annotation_text ("A Test DCP");
 
-       shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+       shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE));
        mp->set_metadata (mxf_meta);
        shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false);
-       dcp::File j2c ("test/data/32x32_red_square.j2c");
+       dcp::ArrayData j2c ("test/data/flat_red.j2c");
        for (int i = 0; i < 24; ++i) {
                /* Left */
                picture_writer->write (j2c.data (), j2c.size ());
@@ -109,7 +110,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        }
        picture_writer->finalize ();
 
-       shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
+       shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE));
        ms->set_metadata (mxf_meta);
        shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", vector<dcp::Channel>());
 
@@ -130,16 +131,14 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        sound_writer->finalize ();
 
-       cpl->add (shared_ptr<dcp::Reel> (
-                         new dcp::Reel (
-                                 shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (mp, 0)),
-                                 shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0))
-                                 )
+       cpl->add (make_shared<dcp::Reel>(
+                         make_shared<dcp::ReelStereoPictureAsset>(mp, 0),
+                         make_shared<dcp::ReelSoundAsset>(ms, 0)
                          ));
 
        d.add (cpl);
 
-       d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+       d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
        /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
 }
@@ -176,35 +175,35 @@ static
 void
 test_rewriting_sound(string name, bool modify)
 {
+       using namespace boost::filesystem;
+
        dcp::DCP A ("test/ref/DCP/dcp_test1");
        A.read ();
 
        BOOST_REQUIRE (!A.cpls().empty());
        BOOST_REQUIRE (!A.cpls().front()->reels().empty());
-       shared_ptr<dcp::ReelMonoPictureAsset> A_picture = dynamic_pointer_cast<dcp::ReelMonoPictureAsset>(A.cpls().front()->reels().front()->main_picture());
+       auto A_picture = dynamic_pointer_cast<dcp::ReelMonoPictureAsset>(A.cpls().front()->reels().front()->main_picture());
        BOOST_REQUIRE (A_picture);
-       shared_ptr<dcp::ReelSoundAsset> A_sound = dynamic_pointer_cast<dcp::ReelSoundAsset>(A.cpls().front()->reels().front()->main_sound());
+       auto A_sound = dynamic_pointer_cast<dcp::ReelSoundAsset>(A.cpls().front()->reels().front()->main_sound());
+
+       string const picture = "j2c_5279f9aa-94d7-42a6-b0e0-e4eaec4e2a15.mxf";
 
-       boost::filesystem::remove_all ("build/test/" + name);
+       remove_all ("build/test/" + name);
        dcp::DCP B ("build/test/" + name);
-       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       auto reel = make_shared<dcp::Reel>();
 
        BOOST_REQUIRE (A_picture->mono_asset());
        BOOST_REQUIRE (A_picture->mono_asset()->file());
-       boost::filesystem::copy_file (A_picture->mono_asset()->file().get(), "build/test/" +name + "/picture.mxf");
-       reel->add(
-               shared_ptr<dcp::ReelMonoPictureAsset>(
-                       new dcp::ReelMonoPictureAsset(shared_ptr<dcp::MonoPictureAsset>(new dcp::MonoPictureAsset("build/test/" + name + "/picture.mxf")), 0)
-                       )
-               );
+       copy_file (A_picture->mono_asset()->file().get(), path("build") / "test" / name / picture);
+       reel->add(make_shared<dcp::ReelMonoPictureAsset>(make_shared<dcp::MonoPictureAsset>(path("build") / "test" / name / picture), 0));
 
-       shared_ptr<dcp::SoundAssetReader> reader = A_sound->asset()->start_read();
-       shared_ptr<dcp::SoundAsset> sound(new dcp::SoundAsset(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::SMPTE));
-       shared_ptr<dcp::SoundAssetWriter> writer = sound->start_write("build/test/" + name + "/sound.mxf", vector<dcp::Channel>());
+       auto reader = A_sound->asset()->start_read();
+       auto sound = make_shared<dcp::SoundAsset>(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::Standard::SMPTE);
+       auto writer = sound->start_write(path("build") / "test" / name / "pcm_8246f87f-e1df-4c42-a290-f3b3069ff021.mxf", {});
 
        bool need_to_modify = modify;
        for (int i = 0; i < A_sound->asset()->intrinsic_duration(); ++i) {
-               shared_ptr<const dcp::SoundFrame> sf = reader->get_frame (i);
+               auto sf = reader->get_frame (i);
                float* out[sf->channels()];
                for (int j = 0; j < sf->channels(); ++j) {
                        out[j] = new float[sf->samples()];
@@ -225,13 +224,14 @@ test_rewriting_sound(string name, bool modify)
        }
        writer->finalize();
 
-       reel->add(shared_ptr<dcp::ReelSoundAsset>(new dcp::ReelSoundAsset(sound, 0)));
+       reel->add(make_shared<dcp::ReelSoundAsset>(sound, 0));
+       reel->add(simple_markers());
 
-       shared_ptr<dcp::CPL> cpl(new dcp::CPL("A Test DCP", dcp::FEATURE));
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
        cpl->add (reel);
 
        B.add (cpl);
-       B.write_xml (dcp::SMPTE);
+       B.write_xml (dcp::Standard::SMPTE);
 
        dcp::EqualityOptions eq;
        eq.reel_hashes_can_differ = true;
@@ -270,7 +270,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
        boost::filesystem::remove_all ("build/test/DCP/dcp_test5");
        boost::filesystem::create_directories ("build/test/DCP/dcp_test5");
        dcp::DCP d ("build/test/DCP/dcp_test5");
-       shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::FEATURE);
        cpl->set_content_version (
                dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
                );
@@ -279,16 +279,16 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
        cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
        cpl->set_annotation_text ("A Test DCP");
 
-       shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+       auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
        mp->set_metadata (mxf_meta);
        shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", false);
-       dcp::File j2c ("test/data/32x32_red_square.j2c");
+       dcp::ArrayData j2c ("test/data/flat_red.j2c");
        for (int i = 0; i < 24; ++i) {
                picture_writer->write (j2c.data (), j2c.size ());
        }
        picture_writer->finalize ();
 
-       shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
+       auto ms = make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
        ms->set_metadata (mxf_meta);
        shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", vector<dcp::Channel>());
 
@@ -323,7 +323,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        d.add (cpl);
 
-       d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+       d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
        /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
 }
@@ -348,7 +348,7 @@ BOOST_AUTO_TEST_CASE (dcp_test7)
        RNGFixer fix;
 
        make_simple("build/test/DCP/dcp_test7")->write_xml(
-               dcp::INTEROP,  "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+               dcp::Standard::INTEROP, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
                );
 
        /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
C++ library for handling digital cinema packages (DCPs).