diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-05 16:55:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-05 16:55:32 +0000 |
| commit | ca5f02dbf193fa5655c57cb25be96a3c9fd05157 (patch) | |
| tree | d5be6180bca64a0f4f8af9aaef2030080787fc24 | |
| parent | e3b5521ac40125c3dfd9f254856cf58ea1584f79 (diff) | |
Put everything into dcp::dc and change DCP -> Package.
163 files changed, 976 insertions, 854 deletions
diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc index ae7890a5..c1182dea 100644 --- a/examples/make_dcp.cc +++ b/examples/make_dcp.cc @@ -48,19 +48,19 @@ main () { /* Create a directory to put the DCP in */ boost::filesystem::create_directory ("DCP"); - + /* Make a picture asset. This is a file which combines JPEG2000 files together to make up the video of the DCP. First, create the object, specifying a frame rate of 24 frames per second. */ - boost::shared_ptr<dcp::MonoPictureAsset> picture_asset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + boost::shared_ptr<dcp::dc::MonoPictureAsset> picture_asset (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); /* Start off a write to it */ - boost::shared_ptr<dcp::PictureAssetWriter> picture_writer = picture_asset->start_write ("DCP/picture.mxf", dcp::SMPTE, false); + boost::shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = picture_asset->start_write ("DCP/picture.mxf", dcp::dc::SMPTE, false); /* Write 24 frames of the same JPEG2000 file */ - dcp::File picture ("examples/help.j2c"); + dcp::dc::File picture ("examples/help.j2c"); for (int i = 0; i < 24; ++i) { picture_writer->write (picture.data(), picture.size()); } @@ -71,8 +71,8 @@ main () /* Now create a sound MXF. As before, create an object and a writer. When creating the object we specify the sampling rate (48kHz) and the number of channels (2). */ - boost::shared_ptr<dcp::SoundAsset> sound_asset (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 2)); - boost::shared_ptr<dcp::SoundAssetWriter> sound_writer = sound_asset->start_write ("DCP/sound.mxf", dcp::SMPTE); + boost::shared_ptr<dcp::dc::SoundAsset> sound_asset (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 2)); + boost::shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = sound_asset->start_write ("DCP/sound.mxf", dcp::dc::SMPTE); /* Write some sine waves */ float* audio[2]; @@ -90,22 +90,22 @@ main () sound_writer->finalize (); /* Now create a reel */ - boost::shared_ptr<dcp::Reel> reel (new dcp::Reel ()); + boost::shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); /* Add picture and sound to it. The zeros are the `entry points', i.e. the first (video) frame from the assets that the reel should play. */ - reel->add (boost::shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelMonoPictureAsset (picture_asset, 0))); - reel->add (boost::shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (sound_asset, 0))); + reel->add (boost::shared_ptr<dcp::dc::ReelPictureAsset> (new dcp::dc::ReelMonoPictureAsset (picture_asset, 0))); + reel->add (boost::shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (sound_asset, 0))); /* Make a CPL with this reel */ - boost::shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE)); + boost::shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("My film", dcp::dc::FEATURE)); cpl->add (reel); /* Write the DCP */ - dcp::DCP dcp ("DCP"); + dcp::dc::Package dcp ("DCP"); dcp.add (cpl); - dcp.write_xml (dcp::SMPTE); - + dcp.write_xml (dcp::dc::SMPTE); + return 0; } diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc index 4e3f4836..b7ee5b72 100644 --- a/examples/read_dcp.cc +++ b/examples/read_dcp.cc @@ -46,7 +46,7 @@ int main () { /* Create a DCP, specifying where our existing data is */ - dcp::DCP dcp ("/home/carl/diagonal.com/APPASSIONATA_TLR_F_UK-DEFR_CH_51_2K_LOK_20121115_DGL_OV"); + dcp::dc::Package dcp ("/home/carl/diagonal.com/APPASSIONATA_TLR_F_UK-DEFR_CH_51_2K_LOK_20121115_DGL_OV"); /* Read the DCP to find out about it */ dcp.read (); @@ -57,40 +57,40 @@ main () } std::cout << "DCP has " << dcp.cpls().size() << " CPLs.\n"; - std::list<boost::shared_ptr<dcp::Asset> > assets = dcp.assets (); + std::list<boost::shared_ptr<dcp::dc::Asset> > assets = dcp.assets (); std::cout << "DCP has " << assets.size() << " assets.\n"; - for (std::list<boost::shared_ptr<dcp::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) { - if (boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (*i)) { + for (std::list<boost::shared_ptr<dcp::dc::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) { + if (boost::dynamic_pointer_cast<dcp::dc::MonoPictureAsset> (*i)) { std::cout << "2D picture\n"; - } else if (boost::dynamic_pointer_cast<dcp::StereoPictureAsset> (*i)) { + } else if (boost::dynamic_pointer_cast<dcp::dc::StereoPictureAsset> (*i)) { std::cout << "3D picture\n"; - } else if (boost::dynamic_pointer_cast<dcp::SoundAsset> (*i)) { + } else if (boost::dynamic_pointer_cast<dcp::dc::SoundAsset> (*i)) { std::cout << "Sound\n"; - } else if (boost::dynamic_pointer_cast<dcp::SubtitleAsset> (*i)) { + } else if (boost::dynamic_pointer_cast<dcp::dc::SubtitleAsset> (*i)) { std::cout << "Subtitle\n"; - } else if (boost::dynamic_pointer_cast<dcp::CPL> (*i)) { + } else if (boost::dynamic_pointer_cast<dcp::dc::CPL> (*i)) { std::cout << "CPL\n"; } std::cout << "\t" << (*i)->file().leaf().string() << "\n"; } /* Take the first CPL */ - boost::shared_ptr<dcp::CPL> cpl = dcp.cpls().front (); + boost::shared_ptr<dcp::dc::CPL> cpl = dcp.cpls().front (); /* Get the picture asset in the first reel */ - boost::shared_ptr<dcp::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::MonoPictureAsset> ( + boost::shared_ptr<dcp::dc::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::dc::MonoPictureAsset> ( cpl->reels().front()->main_picture()->asset() ); /* Get the 1000th frame of it */ - boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999); + boost::shared_ptr<const dcp::dc::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999); /* Get the frame as an XYZ image */ - boost::shared_ptr<const dcp::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image (); + boost::shared_ptr<const dcp::dc::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image (); /* Convert to ARGB */ boost::scoped_array<uint8_t> rgba (new uint8_t[picture_image_xyz->size().width * picture_image_xyz->size().height * 4]); - dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get ()); + dcp::dc::xyz_to_rgba (picture_image_xyz, dcp::dc::ColourConversion::srgb_to_xyz(), rgba.get ()); Magick::Image image (picture_image_xyz->size().width, picture_image_xyz->size().height, "BGRA", Magick::CharPixel, rgba.get ()); image.write ("frame.png"); diff --git a/src/asset.cc b/src/asset.cc index 81321d4d..05719d46 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -33,7 +33,7 @@ using std::string; using boost::function; using boost::optional; -using namespace dcp; +using namespace dcp::dc; /** Create an Asset with a randomly-generated ID */ Asset::Asset () diff --git a/src/asset.h b/src/asset.h index c7911497..e8ef754f 100644 --- a/src/asset.h +++ b/src/asset.h @@ -37,6 +37,7 @@ namespace xmlpp { struct asset_test; namespace dcp { +namespace dc { /** @class Asset * @brief Parent class for DCP assets, i.e. picture, sound, subtitles, CPLs, fonts. @@ -90,5 +91,6 @@ protected: }; } +} #endif diff --git a/src/asset_writer.cc b/src/asset_writer.cc index 13adc50e..d9ab3c96 100644 --- a/src/asset_writer.cc +++ b/src/asset_writer.cc @@ -27,7 +27,7 @@ #include "AS_DCP.h" #include "KM_prng.h" -using namespace dcp; +using namespace dcp::dc; /** Create an AssetWriter. * @param mxf MXF that we are writing. diff --git a/src/asset_writer.h b/src/asset_writer.h index 4266c719..56fe4bdf 100644 --- a/src/asset_writer.h +++ b/src/asset_writer.h @@ -31,6 +31,7 @@ namespace ASDCP { } namespace dcp { +namespace dc { class MXF; @@ -69,5 +70,6 @@ protected: }; } +} #endif diff --git a/src/certificate.cc b/src/certificate.cc index 36aef7f9..eda80513 100644 --- a/src/certificate.cc +++ b/src/certificate.cc @@ -41,7 +41,7 @@ using std::string; using std::ostream; using std::min; using std::stringstream; -using namespace dcp; +using namespace dcp::dc; static string const begin_certificate = "-----BEGIN CERTIFICATE-----"; static string const end_certificate = "-----END CERTIFICATE-----"; @@ -352,19 +352,19 @@ Certificate::public_key () const } bool -dcp::operator== (Certificate const & a, Certificate const & b) +dcp::dc::operator== (Certificate const & a, Certificate const & b) { return a.certificate() == b.certificate(); } bool -dcp::operator< (Certificate const & a, Certificate const & b) +dcp::dc::operator< (Certificate const & a, Certificate const & b) { return a.certificate() < b.certificate(); } ostream& -dcp::operator<< (ostream& s, Certificate const & c) +dcp::dc::operator<< (ostream& s, Certificate const & c) { s << c.certificate(); return s; diff --git a/src/certificate.h b/src/certificate.h index 6225cf31..d97b8d19 100644 --- a/src/certificate.h +++ b/src/certificate.h @@ -37,6 +37,7 @@ namespace xmlpp { } namespace dcp { +namespace dc { /** @class Certificate * @brief A wrapper for an X509 certificate. @@ -92,5 +93,6 @@ bool operator< (Certificate const & a, Certificate const & b); std::ostream& operator<< (std::ostream&s, Certificate const & c); } +} #endif diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc index b37c07bf..e53a178c 100644 --- a/src/certificate_chain.cc +++ b/src/certificate_chain.cc @@ -48,7 +48,7 @@ using std::ofstream; using std::ifstream; using std::runtime_error; using std::stringstream; -using namespace dcp; +using namespace dcp::dc; /** Run a shell command. * @param cmd Command to run (UTF8-encoded). @@ -96,7 +96,7 @@ command (string cmd) if (code) { stringstream s; s << "error " << code << " in " << cmd << " within " << boost::filesystem::current_path(); - throw dcp::MiscError (s.str()); + throw dcp::dc::MiscError (s.str()); } } @@ -120,7 +120,7 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path string pub; ifstream f (public_name.string().c_str ()); if (!f.good ()) { - throw dcp::MiscError ("public key not found"); + throw dcp::dc::MiscError ("public key not found"); } bool read = false; @@ -139,22 +139,22 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path /* Decode the base64 of the public key */ unsigned char buffer[512]; - int const N = dcp::base64_decode (pub, buffer, 1024); + int const N = dcp::dc::base64_decode (pub, buffer, 1024); /* Hash it with SHA1 (without the first 24 bytes, for reasons that are not entirely clear) */ SHA_CTX context; if (!SHA1_Init (&context)) { - throw dcp::MiscError ("could not init SHA1 context"); + throw dcp::dc::MiscError ("could not init SHA1 context"); } if (!SHA1_Update (&context, buffer + 24, N - 24)) { - throw dcp::MiscError ("could not update SHA1 digest"); + throw dcp::dc::MiscError ("could not update SHA1 digest"); } unsigned char digest[SHA_DIGEST_LENGTH]; if (!SHA1_Final (digest, &context)) { - throw dcp::MiscError ("could not finish SHA1 digest"); + throw dcp::dc::MiscError ("could not finish SHA1 digest"); } char digest_base64[64]; @@ -289,11 +289,11 @@ CertificateChain::CertificateChain ( boost::filesystem::current_path (cwd); - _certificates.push_back (dcp::Certificate (dcp::file_to_string (directory / "ca.self-signed.pem"))); - _certificates.push_back (dcp::Certificate (dcp::file_to_string (directory / "intermediate.signed.pem"))); - _certificates.push_back (dcp::Certificate (dcp::file_to_string (directory / "leaf.signed.pem"))); + _certificates.push_back (dcp::dc::Certificate (dcp::dc::file_to_string (directory / "ca.self-signed.pem"))); + _certificates.push_back (dcp::dc::Certificate (dcp::dc::file_to_string (directory / "intermediate.signed.pem"))); + _certificates.push_back (dcp::dc::Certificate (dcp::dc::file_to_string (directory / "leaf.signed.pem"))); - _key = dcp::file_to_string (directory / "leaf.key"); + _key = dcp::dc::file_to_string (directory / "leaf.key"); boost::filesystem::remove_all (directory); } diff --git a/src/certificate_chain.h b/src/certificate_chain.h index 4e13d6ee..f8d540a1 100644 --- a/src/certificate_chain.h +++ b/src/certificate_chain.h @@ -34,6 +34,7 @@ namespace xmlpp { } namespace dcp { +namespace dc { /** @class CertificateChain * @brief A chain of any number of certificates, from root to leaf. @@ -95,5 +96,6 @@ private: }; } +} #endif diff --git a/src/chromaticity.h b/src/chromaticity.h index 1cf68248..664eff59 100644 --- a/src/chromaticity.h +++ b/src/chromaticity.h @@ -27,6 +27,7 @@ #include <cmath> namespace dcp { +namespace dc { /** @class Chromaticity * @brief A representation of a x,y,z chromaticity, where z = 1 - x - y @@ -58,5 +59,6 @@ public: }; } +} #endif diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc index 8c48c2e1..d2a4be9b 100644 --- a/src/colour_conversion.cc +++ b/src/colour_conversion.cc @@ -28,7 +28,7 @@ using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; ColourConversion const & ColourConversion::srgb_to_xyz () diff --git a/src/colour_conversion.h b/src/colour_conversion.h index 47071dd1..ba62885a 100644 --- a/src/colour_conversion.h +++ b/src/colour_conversion.h @@ -30,6 +30,7 @@ #include <boost/optional.hpp> namespace dcp { +namespace dc { class TransferFunction; @@ -156,5 +157,6 @@ protected: }; } +} #endif diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc index 32683e8e..6d9c5414 100644 --- a/src/colour_matrix.cc +++ b/src/colour_matrix.cc @@ -23,13 +23,13 @@ EasyDCP player, I think. */ -double const dcp::colour_matrix::xyz_to_rgb[3][3] = { +double const dcp::dc::colour_matrix::xyz_to_rgb[3][3] = { { 3.24096989631653, -1.5373831987381, -0.498610764741898 }, { -0.96924364566803, 1.87596750259399, 0.0415550582110882 }, { 0.0556300804018974, -0.203976958990097, 1.05697154998779 } }; -double const dcp::colour_matrix::rgb_to_xyz[3][3] = { +double const dcp::dc::colour_matrix::rgb_to_xyz[3][3] = { {0.4124564, 0.3575761, 0.1804375}, {0.2126729, 0.7151522, 0.0721750}, {0.0193339, 0.1191920, 0.9503041} diff --git a/src/colour_matrix.h b/src/colour_matrix.h index d4f64591..f7d98b18 100644 --- a/src/colour_matrix.h +++ b/src/colour_matrix.h @@ -18,6 +18,7 @@ */ namespace dcp { +namespace dc { namespace colour_matrix { @@ -25,5 +26,6 @@ extern double const xyz_to_rgb[3][3]; extern double const rgb_to_xyz[3][3]; } +} } @@ -42,7 +42,7 @@ using std::cout; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; CPL::CPL (string annotation_text, ContentKind content_kind) : _annotation_text (annotation_text) @@ -37,6 +37,7 @@ #include <list> namespace dcp { +namespace dc { class ReelAsset; class Reel; @@ -133,5 +134,6 @@ private: }; } +} #endif diff --git a/src/data.cc b/src/data.cc index e8437361..c05677ac 100644 --- a/src/data.cc +++ b/src/data.cc @@ -24,7 +24,7 @@ #include <cerrno> using boost::shared_array; -using namespace dcp; +using namespace dcp::dc; Data::Data () : _size (0) @@ -25,6 +25,7 @@ #include <stdint.h> namespace dcp { +namespace dc { class Data { @@ -59,5 +60,6 @@ private: }; } +} #endif @@ -62,9 +62,9 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::algorithm::starts_with; -using namespace dcp; +using namespace dcp::dc; -DCP::DCP (boost::filesystem::path directory) +Package::Package (boost::filesystem::path directory) : _directory (directory) { if (!boost::filesystem::exists (directory)) { @@ -75,7 +75,7 @@ DCP::DCP (boost::filesystem::path directory) } template<class T> void -survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e) +survivable_error (bool keep_going, dcp::dc::Package::ReadErrors* errors, T const & e) { if (keep_going) { if (errors) { @@ -87,7 +87,7 @@ survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e) } void -DCP::read (bool keep_going, ReadErrors* errors) +Package::read (bool keep_going, ReadErrors* errors) { /* Read the ASSETMAP */ @@ -186,7 +186,7 @@ DCP::read (bool keep_going, ReadErrors* errors) } void -DCP::resolve_refs (list<shared_ptr<Asset> > assets) +Package::resolve_refs (list<shared_ptr<Asset> > assets) { BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) { i->resolve_refs (assets); @@ -194,7 +194,7 @@ DCP::resolve_refs (list<shared_ptr<Asset> > assets) } bool -DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const +Package::equals (Package const & other, EqualityOptions opt, NoteHandler note) const { list<shared_ptr<CPL> > a = cpls (); list<shared_ptr<CPL> > b = other.cpls (); @@ -221,13 +221,13 @@ DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const } void -DCP::add (boost::shared_ptr<CPL> cpl) +Package::add (boost::shared_ptr<CPL> cpl) { _cpls.push_back (cpl); } bool -DCP::encrypted () const +Package::encrypted () const { BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) { if (i->encrypted ()) { @@ -239,7 +239,7 @@ DCP::encrypted () const } void -DCP::add (DecryptedKDM const & kdm) +Package::add (DecryptedKDM const & kdm) { list<DecryptedKDMKey> keys = kdm.keys (); @@ -253,7 +253,7 @@ DCP::add (DecryptedKDM const & kdm) } boost::filesystem::path -DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const CertificateChain> signer) const +Package::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const CertificateChain> signer) const { boost::filesystem::path p = _directory; p /= String::compose ("pkl_%1.xml", pkl_uuid); @@ -297,7 +297,7 @@ DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared * @param standard DCP standard to use (INTEROP or SMPTE) */ void -DCP::write_volindex (Standard standard) const +Package::write_volindex (Standard standard) const { boost::filesystem::path p = _directory; switch (standard) { @@ -330,7 +330,7 @@ DCP::write_volindex (Standard standard) const } void -DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const +Package::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const { boost::filesystem::path p = _directory; @@ -405,7 +405,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta * @param signer Signer to use, or 0. */ void -DCP::write_xml ( +Package::write_xml ( Standard standard, XMLMetadata metadata, shared_ptr<const CertificateChain> signer @@ -424,14 +424,14 @@ DCP::write_xml ( } list<shared_ptr<CPL> > -DCP::cpls () const +Package::cpls () const { return _cpls; } /** @return All assets (including CPLs) */ list<shared_ptr<Asset> > -DCP::assets () const +Package::assets () const { list<shared_ptr<Asset> > assets; BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) { @@ -38,8 +38,8 @@ namespace xmlpp { } /** @brief Namespace for everything in libdcp */ -namespace dcp -{ +namespace dcp { +namespace dc { class Content; class Reel; @@ -50,21 +50,21 @@ class DecryptedKDM; class Asset; class DCPReadError; -/** @class DCP +/** @class Package * @brief A class to create or read a DCP. */ -class DCP : public boost::noncopyable +class Package : public boost::noncopyable { public: - /** Construct a DCP. You can pass an existing DCP's directory + /** Construct a DCP package. You can pass an existing DCP's directory * as the parameter; alternatively, directory will be created * if it does not exist. Note that if you pass an existing DCP * into this constructor it will not be read until you call ::read(). * * @param directory Directory containing the DCP's files. */ - DCP (boost::filesystem::path directory); + Package (boost::filesystem::path directory); typedef std::list<boost::shared_ptr<DCPReadError> > ReadErrors; @@ -80,7 +80,7 @@ public: * @param note Functor to handle notes made by the equality operation. * @return true if the DCPs are equal according to EqualityOptions, otherwise false. */ - bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const; + bool equals (Package const & other, EqualityOptions options, NoteHandler note) const; void add (boost::shared_ptr<CPL> cpl); @@ -126,5 +126,6 @@ private: }; } +} #endif diff --git a/src/dcp_time.cc b/src/dcp_time.cc index 4e7ab6f2..8ee7cc03 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -31,7 +31,7 @@ using namespace std; using namespace boost; -using namespace dcp; +using namespace dcp::dc; Time::Time (int frame, int frames_per_second, int tcr_) { @@ -94,31 +94,31 @@ Time::Time (string time, int tcr_) } bool -dcp::operator== (Time const & a, Time const & b) +dcp::dc::operator== (Time const & a, Time const & b) { return (a.h == b.h && a.m == b.m && a.s == b.s && (a.e * b.tcr) == (b.e * a.tcr)); } bool -dcp::operator!= (Time const & a, Time const & b) +dcp::dc::operator!= (Time const & a, Time const & b) { return !(a == b); } bool -dcp::operator<= (Time const & a, Time const & b) +dcp::dc::operator<= (Time const & a, Time const & b) { return a < b || a == b; } bool -dcp::operator>= (Time const & a, Time const & b) +dcp::dc::operator>= (Time const & a, Time const & b) { return a > b || a == b; } bool -dcp::operator< (Time const & a, Time const & b) +dcp::dc::operator< (Time const & a, Time const & b) { if (a.h != b.h) { return a.h < b.h; @@ -140,7 +140,7 @@ dcp::operator< (Time const & a, Time const & b) } bool -dcp::operator> (Time const & a, Time const & b) +dcp::dc::operator> (Time const & a, Time const & b) { if (a.h != b.h) { return a.h > b.h; @@ -162,14 +162,14 @@ dcp::operator> (Time const & a, Time const & b) } ostream & -dcp::operator<< (ostream& s, Time const & t) +dcp::dc::operator<< (ostream& s, Time const & t) { s << t.h << ":" << t.m << ":" << t.s << "." << t.e; return s; } -dcp::Time -dcp::operator+ (Time a, Time b) +dcp::dc::Time +dcp::dc::operator+ (Time a, Time b) { Time r; @@ -205,8 +205,8 @@ dcp::operator+ (Time a, Time b) return r; } -dcp::Time -dcp::operator- (Time a, Time b) +dcp::dc::Time +dcp::dc::operator- (Time a, Time b) { Time r; @@ -243,7 +243,7 @@ dcp::operator- (Time a, Time b) } float -dcp::operator/ (Time a, Time const & b) +dcp::dc::operator/ (Time a, Time const & b) { int64_t const at = a.h * 3600 + a.m * 60 + a.s * float (a.e) / a.tcr; int64_t const bt = b.h * 3600 + b.m * 60 + b.s * float (b.e) / b.tcr; diff --git a/src/dcp_time.h b/src/dcp_time.h index 44e3cf02..79273b79 100644 --- a/src/dcp_time.h +++ b/src/dcp_time.h @@ -30,6 +30,7 @@ #include <iostream> namespace dcp { +namespace dc { /** @class Time * @brief A representation of time within a DCP. @@ -93,5 +94,6 @@ extern Time operator- (Time a, Time b); extern float operator/ (Time a, Time const & b); } +} #endif diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 99cbca10..ffcad646 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -44,7 +44,7 @@ using std::setfill; using std::hex; using std::pair; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; static void put (uint8_t ** d, string s) diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h index f7d21dbe..d674be1d 100644 --- a/src/decrypted_kdm.h +++ b/src/decrypted_kdm.h @@ -32,6 +32,7 @@ #include <boost/filesystem.hpp> namespace dcp { +namespace dc { class DecryptedKDMKey; class EncryptedKDM; @@ -132,5 +133,6 @@ private: }; } +} #endif diff --git a/src/decrypted_kdm_key.cc b/src/decrypted_kdm_key.cc index aac12539..4d1f6f23 100644 --- a/src/decrypted_kdm_key.cc +++ b/src/decrypted_kdm_key.cc @@ -19,10 +19,10 @@ #include "decrypted_kdm_key.h" -using namespace dcp; +using namespace dcp::dc; bool -dcp::operator== (dcp::DecryptedKDMKey const & a, dcp::DecryptedKDMKey const & b) +dcp::dc::operator== (dcp::dc::DecryptedKDMKey const & a, dcp::dc::DecryptedKDMKey const & b) { return a.type() == b.type() && a.id() == b.id() && a.key() == b.key() && a.cpl_id() == b.cpl_id(); } diff --git a/src/decrypted_kdm_key.h b/src/decrypted_kdm_key.h index 70ee6ad8..ef6e502e 100644 --- a/src/decrypted_kdm_key.h +++ b/src/decrypted_kdm_key.h @@ -27,6 +27,7 @@ #include "key.h" namespace dcp { +namespace dc { /** @class DecryptedKDMKey * @brief An un- or de-crypted key from a KDM. @@ -67,5 +68,6 @@ private: bool operator== (DecryptedKDMKey const &, DecryptedKDMKey const &); } +} #endif diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index 205d591b..74ccf7f6 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -33,9 +33,10 @@ using std::string; using std::map; using std::pair; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; namespace dcp { +namespace dc { /** Namespace for classes used to hold our data; they are internal to this .cc file */ namespace data { @@ -495,6 +496,7 @@ public: } } +} EncryptedKDM::EncryptedKDM (string s) { @@ -647,7 +649,7 @@ EncryptedKDM::issue_date () const } bool -dcp::operator== (EncryptedKDM const & a, EncryptedKDM const & b) +dcp::dc::operator== (EncryptedKDM const & a, EncryptedKDM const & b) { /* Not exactly efficient... */ return a.as_xml() == b.as_xml(); diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h index c899dcbe..0166d9d6 100644 --- a/src/encrypted_kdm.h +++ b/src/encrypted_kdm.h @@ -34,6 +34,7 @@ namespace cxml { } namespace dcp { +namespace dc { namespace data { class EncryptedKDMData; @@ -101,5 +102,6 @@ private: extern bool operator== (EncryptedKDM const & a, EncryptedKDM const & b); } +} #endif diff --git a/src/exceptions.cc b/src/exceptions.cc index ed6edaa4..b95d2615 100644 --- a/src/exceptions.cc +++ b/src/exceptions.cc @@ -26,7 +26,7 @@ using std::string; using std::runtime_error; -using namespace dcp; +using namespace dcp::dc; FileError::FileError (string message, boost::filesystem::path filename, int number) : runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number)) diff --git a/src/exceptions.h b/src/exceptions.h index 801bfb01..1143f8a6 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -26,8 +26,8 @@ * @brief Exceptions thrown by libdcp. */ -namespace dcp -{ +namespace dcp { +namespace dc { /** @class FileError * @brief An exception related to a file @@ -154,5 +154,6 @@ public: }; } +} #endif diff --git a/src/file.cc b/src/file.cc index 2009a036..743bc399 100644 --- a/src/file.cc +++ b/src/file.cc @@ -26,7 +26,7 @@ #include "dcp_assert.h" #include <stdio.h> -using namespace dcp; +using namespace dcp::dc; /** Read a file into memory. * @param file to read. @@ -35,7 +35,7 @@ File::File (boost::filesystem::path file) { _size = boost::filesystem::file_size (file); _data = new uint8_t[_size]; - FILE* f = dcp::fopen_boost (file, "rb"); + FILE* f = dcp::dc::fopen_boost (file, "rb"); DCP_ASSERT (f); fread (_data, 1, _size, f); fclose (f); @@ -28,6 +28,7 @@ #include <boost/noncopyable.hpp> namespace dcp { +namespace dc { /** @class File * @brief Helper class which loads a file into memory. @@ -52,5 +53,6 @@ private: }; } +} #endif diff --git a/src/font_asset.cc b/src/font_asset.cc index 2cd03f27..b04fdbbe 100644 --- a/src/font_asset.cc +++ b/src/font_asset.cc @@ -25,7 +25,7 @@ using std::string; -using namespace dcp; +using namespace dcp::dc; FontAsset::FontAsset (string id, boost::filesystem::path file) : Asset (id, file) diff --git a/src/font_asset.h b/src/font_asset.h index 8abd6047..8dfb34f0 100644 --- a/src/font_asset.h +++ b/src/font_asset.h @@ -24,6 +24,7 @@ #include "asset.h" namespace dcp { +namespace dc { /** @class FontAsset * @brief A (truetype) font asset for subtitles in an Interop DCP. @@ -38,3 +39,4 @@ private: }; } +} diff --git a/src/font_node.cc b/src/font_node.cc index 5d857bc1..81e0fec7 100644 --- a/src/font_node.cc +++ b/src/font_node.cc @@ -29,7 +29,7 @@ using std::string; using std::list; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; FontNode::FontNode (cxml::ConstNodePtr node, int tcr, string font_id_attribute) { diff --git a/src/font_node.h b/src/font_node.h index 50815636..3d1d074e 100644 --- a/src/font_node.h +++ b/src/font_node.h @@ -29,6 +29,7 @@ #include <list> namespace dcp { +namespace dc { /** @class FontNode * @brief Helper class for parsing subtitle XML. @@ -58,3 +59,4 @@ public: }; } +} diff --git a/src/gamma_transfer_function.cc b/src/gamma_transfer_function.cc index fe560f54..70a332b7 100644 --- a/src/gamma_transfer_function.cc +++ b/src/gamma_transfer_function.cc @@ -27,7 +27,7 @@ using std::pow; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; GammaTransferFunction::GammaTransferFunction (double gamma) : _gamma (gamma) diff --git a/src/gamma_transfer_function.h b/src/gamma_transfer_function.h index 24d65df0..ce588e05 100644 --- a/src/gamma_transfer_function.h +++ b/src/gamma_transfer_function.h @@ -24,6 +24,7 @@ #include "transfer_function.h" namespace dcp { +namespace dc { /** A description of a gamma function of the f(x) = x^g where * g is the gamma. @@ -47,3 +48,4 @@ private: }; } +} diff --git a/src/interop_load_font_node.cc b/src/interop_load_font_node.cc index 6bd865c9..34d47e17 100644 --- a/src/interop_load_font_node.cc +++ b/src/interop_load_font_node.cc @@ -23,7 +23,7 @@ using std::string; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; InteropLoadFontNode::InteropLoadFontNode (string id_, string uri_) : LoadFontNode (id_) @@ -44,13 +44,13 @@ InteropLoadFontNode::InteropLoadFontNode (cxml::ConstNodePtr node) } bool -dcp::operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b) +dcp::dc::operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b) { return a.id == b.id && a.uri == b.uri; } bool -dcp::operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b) +dcp::dc::operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b) { return !(a == b); } diff --git a/src/interop_load_font_node.h b/src/interop_load_font_node.h index f21a03aa..f25c3c11 100644 --- a/src/interop_load_font_node.h +++ b/src/interop_load_font_node.h @@ -23,6 +23,7 @@ #include <boost/optional.hpp> namespace dcp { +namespace dc { class InteropLoadFontNode : public LoadFontNode { @@ -38,3 +39,4 @@ bool operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b); bool operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b); } +} diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index a2742b78..b797dc74 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -39,7 +39,7 @@ using boost::shared_ptr; using boost::shared_array; using boost::optional; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file) : SubtitleAsset (file) @@ -50,14 +50,14 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file) _reel_number = xml->string_child ("ReelNumber"); _language = xml->string_child ("Language"); _movie_title = xml->string_child ("MovieTitle"); - _load_font_nodes = type_children<dcp::InteropLoadFontNode> (xml, "LoadFont"); + _load_font_nodes = type_children<InteropLoadFontNode> (xml, "LoadFont"); - list<shared_ptr<dcp::FontNode> > font_nodes; + list<shared_ptr<FontNode> > font_nodes; BOOST_FOREACH (cxml::NodePtr const & i, xml->node_children ("Font")) { font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, 250, "Id"))); } - list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes; + list<shared_ptr<SubtitleNode> > subtitle_nodes; BOOST_FOREACH (cxml::NodePtr const & i, xml->node_children ("Subtitle")) { subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, 250, "Id"))); } diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h index 399878d4..c5522f02 100644 --- a/src/interop_subtitle_asset.h +++ b/src/interop_subtitle_asset.h @@ -25,6 +25,7 @@ #include <boost/filesystem.hpp> namespace dcp { +namespace dc { class InteropLoadFontNode; @@ -105,3 +106,4 @@ private: }; } +} @@ -31,12 +31,12 @@ using std::min; using std::pow; using boost::shared_ptr; using boost::shared_array; -using namespace dcp; +using namespace dcp::dc; -shared_ptr<dcp::OpenJPEGImage> -dcp::decompress_j2k (Data data, int reduce) +shared_ptr<OpenJPEGImage> +dcp::dc::decompress_j2k (Data data, int reduce) { - return dcp::decompress_j2k (data.data().get(), data.size(), reduce); + return decompress_j2k (data.data().get(), data.size(), reduce); } class ReadBuffer @@ -83,8 +83,8 @@ read_free_function (void* data) * This is useful for scaling 4K DCP images down to 2K. * @return OpenJPEGImage. */ -shared_ptr<dcp::OpenJPEGImage> -dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) +shared_ptr<OpenJPEGImage> +dcp::dc::decompress_j2k (uint8_t* data, int64_t size, int reduce) { uint8_t const jp2_magic[] = { 0x00, @@ -205,7 +205,7 @@ error_callback (char const * msg, void *) } Data -dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk) +dcp::dc::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk) { /* get a J2K compressor handle */ opj_codec_t* encoder = opj_create_compress (OPJ_CODEC_J2K); @@ -22,6 +22,7 @@ #include <stdint.h> namespace dcp { +namespace dc { class OpenJPEGImage; @@ -30,3 +31,4 @@ extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (Data data, int reduce); extern Data compress_j2k (boost::shared_ptr<const OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk); } +} @@ -33,7 +33,7 @@ using std::string; using std::stringstream; using std::setw; using std::setfill; -using namespace dcp; +using namespace dcp::dc; Key::Key () : _value (new uint8_t[ASDCP::KeyLen]) @@ -90,13 +90,13 @@ Key::hex () const } bool -dcp::operator== (Key const & a, Key const & b) +dcp::dc::operator== (Key const & a, Key const & b) { return memcmp (a.value(), b.value(), ASDCP::KeyLen) == 0; } bool -dcp::operator!= (Key const & a, Key const & b) +dcp::dc::operator!= (Key const & a, Key const & b) { return !(a == b); } @@ -28,6 +28,7 @@ #include <string> namespace dcp { +namespace dc { /** @class Key * @brief A key for decrypting/encrypting assets. @@ -66,5 +67,6 @@ extern bool operator== (Key const & a, Key const & b); extern bool operator!= (Key const & a, Key const & b); } +} #endif diff --git a/src/load_font_node.h b/src/load_font_node.h index 6f916ef0..9b633819 100644 --- a/src/load_font_node.h +++ b/src/load_font_node.h @@ -24,6 +24,7 @@ #include <string> namespace dcp { +namespace dc { /** @class LoadFontNode * @brief Parser for LoadFont nodes from subtitle XML. @@ -42,3 +43,4 @@ public: }; } +} diff --git a/src/local_time.cc b/src/local_time.cc index b8feb849..eec053d5 100644 --- a/src/local_time.cc +++ b/src/local_time.cc @@ -31,7 +31,7 @@ using std::string; using std::ostream; using boost::lexical_cast; -using namespace dcp; +using namespace dcp::dc; /** Construct a LocalTime from the current time */ LocalTime::LocalTime () @@ -173,7 +173,7 @@ LocalTime::operator!= (LocalTime const & other) const } ostream& -dcp::operator<< (ostream& s, LocalTime const & t) +dcp::dc::operator<< (ostream& s, LocalTime const & t) { s << t.as_string (); return s; diff --git a/src/local_time.h b/src/local_time.h index 4a7f3cd8..595f84aa 100644 --- a/src/local_time.h +++ b/src/local_time.h @@ -30,6 +30,7 @@ class local_time_test; namespace dcp { +namespace dc { /** @class LocalTime * @brief A representation of a local time (down to the second), including its offset @@ -76,5 +77,6 @@ std::ostream& operator<< (std::ostream& s, LocalTime const & t); } +} #endif diff --git a/src/metadata.cc b/src/metadata.cc index 8d8abc60..f048f240 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -30,7 +30,7 @@ #include <time.h> using namespace std; -using namespace dcp; +using namespace dcp::dc; MXFMetadata::MXFMetadata () : company_name ("libdcp") diff --git a/src/metadata.h b/src/metadata.h index 54b25138..b99f175f 100644 --- a/src/metadata.h +++ b/src/metadata.h @@ -32,8 +32,8 @@ namespace ASDCP { struct WriterInfo; } -namespace dcp -{ +namespace dcp { +namespace dc { /** @class MXFMetadata * @brief Metadata that is written to a MXF file's header @@ -66,5 +66,6 @@ public: }; } +} #endif diff --git a/src/modified_gamma_transfer_function.cc b/src/modified_gamma_transfer_function.cc index 850c7351..37018bbf 100644 --- a/src/modified_gamma_transfer_function.cc +++ b/src/modified_gamma_transfer_function.cc @@ -23,7 +23,7 @@ using std::pow; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; ModifiedGammaTransferFunction::ModifiedGammaTransferFunction (double power, double threshold, double A, double B) : _power (power) diff --git a/src/modified_gamma_transfer_function.h b/src/modified_gamma_transfer_function.h index e8875d4b..5f09da0b 100644 --- a/src/modified_gamma_transfer_function.h +++ b/src/modified_gamma_transfer_function.h @@ -24,6 +24,7 @@ #include "transfer_function.h" namespace dcp { +namespace dc { /** A transfer function which for an input x gives an output y where * @@ -64,3 +65,4 @@ private: }; } +} diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index b367a19d..ddc35049 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -32,7 +32,7 @@ using std::list; using std::pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file) : PictureAsset (file) diff --git a/src/mono_picture_asset.h b/src/mono_picture_asset.h index a10eada0..8d347690 100644 --- a/src/mono_picture_asset.h +++ b/src/mono_picture_asset.h @@ -23,6 +23,7 @@ #include "picture_asset.h" namespace dcp { +namespace dc { class MonoPictureAssetWriter; @@ -58,5 +59,6 @@ private: }; } +} #endif diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc index 564a5ea1..b28531d1 100644 --- a/src/mono_picture_asset_writer.cc +++ b/src/mono_picture_asset_writer.cc @@ -34,7 +34,7 @@ using std::istream; using std::ostream; using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase { @@ -54,7 +54,7 @@ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::file void MonoPictureAssetWriter::start (uint8_t* data, int size) { - dcp::start (this, _state, _standard, _picture_asset, data, size); + dcp::dc::start (this, _state, _standard, _picture_asset, data, size); _picture_asset->set_frame_rate (_picture_asset->edit_rate()); } diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h index a9ff4015..50e82aa3 100644 --- a/src/mono_picture_asset_writer.h +++ b/src/mono_picture_asset_writer.h @@ -32,6 +32,7 @@ #include <fstream> namespace dcp { +namespace dc { /** @class MonoPictureAssetWriter * @brief A helper class for writing to MonoPictureAssets @@ -65,5 +66,6 @@ private: }; } +} #endif diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 84c91f4b..b0c8d94b 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -37,7 +37,7 @@ using std::string; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; /** Make a picture frame from a JPEG2000 file. * @param path Path to JPEG2000 file. diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h index 68e4edf8..f5105b94 100644 --- a/src/mono_picture_frame.h +++ b/src/mono_picture_frame.h @@ -37,6 +37,7 @@ namespace ASDCP { } namespace dcp { +namespace dc { class OpenJPEGImage; @@ -62,3 +63,4 @@ private: }; } +} @@ -41,7 +41,7 @@ using std::list; using std::pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; MXF::MXF () : _decryption_context (0) @@ -35,8 +35,8 @@ namespace ASDCP { #undef Key #undef set_key -namespace dcp -{ +namespace dcp { +namespace dc { class MXFMetadata; class PictureAssetWriter; @@ -106,5 +106,6 @@ protected: }; } +} #endif diff --git a/src/object.cc b/src/object.cc index f8107218..e94971c8 100644 --- a/src/object.cc +++ b/src/object.cc @@ -26,7 +26,7 @@ #include "util.h" using std::string; -using namespace dcp; +using namespace dcp::dc; /** Create an Object with a random ID. */ Object::Object () diff --git a/src/object.h b/src/object.h index 303e46d3..dfc7dea9 100644 --- a/src/object.h +++ b/src/object.h @@ -30,6 +30,7 @@ class write_subtitle_test; namespace dcp { +namespace dc { /** @class Object * @brief Some part of a DCP that has a UUID. @@ -54,5 +55,6 @@ protected: }; } +} #endif diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc index 047e74dc..504171c6 100644 --- a/src/openjpeg_image.cc +++ b/src/openjpeg_image.cc @@ -26,7 +26,7 @@ #include <openjpeg.h> #include <stdexcept> -using namespace dcp; +using namespace dcp::dc; /** Construct an OpenJPEGImage, taking ownership of the opj_image_t */ OpenJPEGImage::OpenJPEGImage (opj_image_t* image) @@ -83,11 +83,11 @@ OpenJPEGImage::data (int c) const } /** @return Size of the image in pixels */ -dcp::Size +Size OpenJPEGImage::size () const { /* XXX: this may not be right; x0 and y0 can presumably be non-zero */ - return dcp::Size (_opj_image->x1, _opj_image->y1); + return Size (_opj_image->x1, _opj_image->y1); } int diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h index 9687c887..6dd5fe34 100644 --- a/src/openjpeg_image.h +++ b/src/openjpeg_image.h @@ -27,6 +27,7 @@ struct opj_image; typedef struct opj_image opj_image_t; namespace dcp { +namespace dc { /** @class OpenJPEGImage * @brief A wrapper of libopenjpeg's opj_image_t. @@ -39,7 +40,7 @@ public: ~OpenJPEGImage (); int* data (int) const; - dcp::Size size () const; + Size size () const; int precision (int component) const; bool srgb () const; @@ -55,3 +56,4 @@ private: }; } +} diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 4f680c60..c7504f18 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -46,7 +46,7 @@ using std::make_pair; using std::istream; using std::cout; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; PictureAsset::PictureAsset (boost::filesystem::path file) : Asset (file) diff --git a/src/picture_asset.h b/src/picture_asset.h index 19a3322e..9f49a771 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -34,8 +34,8 @@ namespace ASDCP { } } -namespace dcp -{ +namespace dcp { +namespace dc { class MonoPictureFrame; class StereoPictureFrame; @@ -119,7 +119,7 @@ private: std::string pkl_type (Standard standard) const; }; - +} } #endif diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index 3bb6a597..a4dbbfa8 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -29,7 +29,7 @@ using std::istream; using std::ostream; using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite) : AssetWriter (asset, file) diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h index a815fbcd..faa63656 100644 --- a/src/picture_asset_writer.h +++ b/src/picture_asset_writer.h @@ -34,6 +34,7 @@ #include <fstream> namespace dcp { +namespace dc { class PictureAsset; @@ -79,5 +80,6 @@ protected: }; } +} #endif diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc index 43b84385..3aa4b756 100644 --- a/src/picture_asset_writer_common.cc +++ b/src/picture_asset_writer_common.cc @@ -36,7 +36,7 @@ struct ASDCPStateBase } template <class P, class Q> -void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size) +void dcp::dc::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size) { asset->set_file (writer->_file); diff --git a/src/raw_convert.h b/src/raw_convert.h index 90737c0c..b5766674 100644 --- a/src/raw_convert.h +++ b/src/raw_convert.h @@ -24,6 +24,7 @@ #include <iomanip> namespace dcp { +namespace dc { /** A sort-of version of boost::lexical_cast that does uses the "C" * locale (i.e. no thousands separators and a . for the decimal separator). @@ -41,6 +42,7 @@ raw_convert (Q v, int precision = 16) return r; } -}; +} +} #endif diff --git a/src/reel.cc b/src/reel.cc index 772ac717..53006353 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -39,7 +39,7 @@ using std::cout; using std::max; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; Reel::Reel (boost::shared_ptr<const cxml::Node> node) : Object (remove_urn_uuid (node->string_child ("Id"))) @@ -33,6 +33,7 @@ namespace cxml { } namespace dcp { +namespace dc { class DecryptedKDM; class ReelAsset; @@ -92,5 +93,6 @@ private: }; } +} #endif diff --git a/src/reel_asset.cc b/src/reel_asset.cc index 2414c69f..8b15d840 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -35,7 +35,7 @@ using std::string; using std::stringstream; using std::make_pair; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; ReelAsset::ReelAsset () : _asset_ref (_id) diff --git a/src/reel_asset.h b/src/reel_asset.h index 9211fbd1..d8662283 100644 --- a/src/reel_asset.h +++ b/src/reel_asset.h @@ -38,6 +38,7 @@ namespace xmlpp { } namespace dcp { +namespace dc { class Asset; @@ -110,5 +111,6 @@ private: }; } +} #endif diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc index d41cc2ac..b722f3f2 100644 --- a/src/reel_mono_picture_asset.cc +++ b/src/reel_mono_picture_asset.cc @@ -27,7 +27,7 @@ using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; ReelMonoPictureAsset::ReelMonoPictureAsset () { diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h index da2eb087..ad4ca26a 100644 --- a/src/reel_mono_picture_asset.h +++ b/src/reel_mono_picture_asset.h @@ -28,6 +28,7 @@ #include "mono_picture_asset.h" namespace dcp { +namespace dc { class MonoPictureAsset; @@ -56,5 +57,6 @@ private: }; } +} #endif diff --git a/src/reel_mxf.cc b/src/reel_mxf.cc index c03acfa8..05913fd9 100644 --- a/src/reel_mxf.cc +++ b/src/reel_mxf.cc @@ -27,7 +27,7 @@ using std::string; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; ReelMXF::ReelMXF (optional<string> key_id) : _key_id (key_id) diff --git a/src/reel_mxf.h b/src/reel_mxf.h index 4235392e..81256926 100644 --- a/src/reel_mxf.h +++ b/src/reel_mxf.h @@ -33,6 +33,7 @@ namespace cxml { } namespace dcp { +namespace dc { /** @class ReelMXF * @brief Part of a Reel's description which refers to an asset which can be encrypted. @@ -66,5 +67,6 @@ private: }; } +} #endif diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 096d3476..5cbce4e4 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -34,7 +34,7 @@ using std::string; using std::stringstream; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; ReelPictureAsset::ReelPictureAsset () : _frame_rate (Fraction (24, 1)) diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h index 39ef3431..fb74556e 100644 --- a/src/reel_picture_asset.h +++ b/src/reel_picture_asset.h @@ -29,6 +29,7 @@ #include "picture_asset.h" namespace dcp { +namespace dc { /** @class ReelPictureAsset * @brief Part of a Reel's description which refers to a picture asset. @@ -77,5 +78,6 @@ private: }; } +} #endif diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc index 165453ce..d8d634f9 100644 --- a/src/reel_sound_asset.cc +++ b/src/reel_sound_asset.cc @@ -28,7 +28,7 @@ using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point) : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point) diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h index 3158f8a0..ed244678 100644 --- a/src/reel_sound_asset.h +++ b/src/reel_sound_asset.h @@ -28,6 +28,7 @@ #include <string> namespace dcp { +namespace dc { /** @class ReelSoundAsset * @brief Part of a Reel's description which refers to a sound asset. @@ -35,7 +36,7 @@ namespace dcp { class ReelSoundAsset : public ReelAsset, public ReelMXF { public: - ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point); + ReelSoundAsset (boost::shared_ptr<SoundAsset> content, int64_t entry_point); ReelSoundAsset (boost::shared_ptr<const cxml::Node>); void write_to_cpl (xmlpp::Node* node, Standard standard) const; @@ -56,3 +57,4 @@ private: }; } +} diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc index e6e17f63..16649073 100644 --- a/src/reel_stereo_picture_asset.cc +++ b/src/reel_stereo_picture_asset.cc @@ -29,7 +29,7 @@ using std::string; using std::pair; using std::make_pair; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; ReelStereoPictureAsset::ReelStereoPictureAsset () { diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h index 3c68f887..1e7d9c5b 100644 --- a/src/reel_stereo_picture_asset.h +++ b/src/reel_stereo_picture_asset.h @@ -28,6 +28,7 @@ #include "stereo_picture_asset.h" namespace dcp { +namespace dc { class StereoPictureAsset; @@ -57,5 +58,6 @@ private: }; } +} #endif diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc index ed0376ed..bb99b5ec 100644 --- a/src/reel_subtitle_asset.cc +++ b/src/reel_subtitle_asset.cc @@ -26,7 +26,7 @@ using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; ReelSubtitleAsset::ReelSubtitleAsset (boost::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point) : ReelAsset (asset, edit_rate, intrinsic_duration, entry_point) diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h index 272b18f5..c7453072 100644 --- a/src/reel_subtitle_asset.h +++ b/src/reel_subtitle_asset.h @@ -28,6 +28,7 @@ #include "subtitle_asset.h" namespace dcp { +namespace dc { class SubtitleAsset; @@ -49,5 +50,6 @@ private: }; } +} #endif @@ -21,7 +21,7 @@ using std::list; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; /** Look through a list of assets and copy a shared_ptr to any asset * which matches the ID of this one. @@ -31,6 +31,7 @@ #include <string> namespace dcp { +namespace dc { /** @class Ref * @brief A reference to an asset which is identified by a universally-unique identifier (UUID). @@ -103,5 +104,6 @@ private: }; } +} #endif diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index 78083a7d..aefe2b99 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -31,7 +31,7 @@ using std::max; using std::cout; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; #define DCI_COEFFICIENT (48.0 / 52.37) @@ -51,7 +51,7 @@ using namespace dcp; * Lines are packed so that the second row directly follows the first. */ void -dcp::xyz_to_rgba ( +dcp::dc::xyz_to_rgba ( boost::shared_ptr<const OpenJPEGImage> xyz_image, ColourConversion const & conversion, uint8_t* argb @@ -136,7 +136,7 @@ dcp::xyz_to_rgba ( * @param note Optional handler for any notes that may be made during the conversion (e.g. when clamping occurs). */ void -dcp::xyz_to_rgb ( +dcp::dc::xyz_to_rgb ( shared_ptr<const OpenJPEGImage> xyz_image, ColourConversion const & conversion, uint8_t* rgb, @@ -236,10 +236,10 @@ dcp::xyz_to_rgb ( * @param size of RGB image in pixels. * @param stride of RGB data in pixels. */ -shared_ptr<dcp::OpenJPEGImage> -dcp::rgb_to_xyz ( +shared_ptr<OpenJPEGImage> +dcp::dc::rgb_to_xyz ( uint8_t const * rgb, - dcp::Size size, + Size size, int stride, ColourConversion const & conversion, optional<NoteHandler> note @@ -323,8 +323,8 @@ dcp::rgb_to_xyz ( * 16Z, with the 2-byte value for each X/Y/Z component stored as * little-endian. */ -shared_ptr<dcp::OpenJPEGImage> -dcp::xyz_to_xyz (uint8_t const * xyz_16, dcp::Size size, int stride) +shared_ptr<OpenJPEGImage> +dcp::dc::xyz_to_xyz (uint8_t const * xyz_16, Size size, int stride) { shared_ptr<OpenJPEGImage> xyz_12 (new OpenJPEGImage (size)); diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h index 7bd1cd8e..85f5bcf4 100644 --- a/src/rgb_xyz.h +++ b/src/rgb_xyz.h @@ -23,6 +23,7 @@ #include <stdint.h> namespace dcp { +namespace dc { class ARGBImage; class OpenJPEGImage; @@ -45,12 +46,13 @@ extern void xyz_to_rgb ( extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz ( uint8_t const * rgb, - dcp::Size size, + Size size, int stride, ColourConversion const & conversion, boost::optional<NoteHandler> note = boost::optional<NoteHandler> () ); -extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride); +extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, Size size, int stride); } +} diff --git a/src/smpte_load_font_node.cc b/src/smpte_load_font_node.cc index 14a1c9fc..7dfb645f 100644 --- a/src/smpte_load_font_node.cc +++ b/src/smpte_load_font_node.cc @@ -23,7 +23,7 @@ using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; SMPTELoadFontNode::SMPTELoadFontNode (string id, string urn_) : LoadFontNode (id) @@ -40,13 +40,13 @@ SMPTELoadFontNode::SMPTELoadFontNode (shared_ptr<const cxml::Node> node) } bool -dcp::operator== (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b) +dcp::dc::operator== (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b) { return a.id == b.id && a.urn == b.urn; } bool -dcp::operator!= (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b) +dcp::dc::operator!= (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b) { return !(a == b); } diff --git a/src/smpte_load_font_node.h b/src/smpte_load_font_node.h index 823b2d8d..4b8b52c1 100644 --- a/src/smpte_load_font_node.h +++ b/src/smpte_load_font_node.h @@ -30,6 +30,7 @@ namespace cxml { } namespace dcp { +namespace dc { /** @class SMPTELoadFontNode * @brief Parser for LoadFont nodes from SMPTE subtitle XML. @@ -48,3 +49,4 @@ bool operator== (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b); bool operator!= (SMPTELoadFontNode const & a, SMPTELoadFontNode const & b); } +} diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index b4190dd5..a09255aa 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -47,7 +47,7 @@ using boost::split; using boost::is_any_of; using boost::shared_array; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; SMPTESubtitleAsset::SMPTESubtitleAsset () : _intrinsic_duration (0) @@ -91,7 +91,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) } } - _load_font_nodes = type_children<dcp::SMPTELoadFontNode> (xml, "LoadFont"); + _load_font_nodes = type_children<SMPTELoadFontNode> (xml, "LoadFont"); _content_title_text = xml->string_child ("ContentTitleText"); _annotation_text = xml->optional_string_child ("AnnotationText"); @@ -118,12 +118,12 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) shared_ptr<cxml::Node> subtitle_list = xml->optional_node_child ("SubtitleList"); - list<shared_ptr<dcp::FontNode> > font_nodes; + list<shared_ptr<FontNode> > font_nodes; BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Font")) { font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate, "ID"))); } - list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes; + list<shared_ptr<SubtitleNode> > subtitle_nodes; BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Subtitle")) { subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, _time_code_rate, "ID"))); } @@ -235,7 +235,7 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const descriptor.EditRate = ASDCP::Rational (_edit_rate.numerator, _edit_rate.denominator); descriptor.EncodingName = "UTF-8"; - BOOST_FOREACH (shared_ptr<dcp::SMPTELoadFontNode> i, _load_font_nodes) { + BOOST_FOREACH (shared_ptr<SMPTELoadFontNode> i, _load_font_nodes) { list<Font>::const_iterator j = _fonts.begin (); while (j != _fonts.end() && j->load_id != i->id) { ++j; @@ -266,7 +266,7 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const boost::throw_exception (MXFFileError ("could not write XML to timed text resource", p.string(), r)); } - BOOST_FOREACH (shared_ptr<dcp::SMPTELoadFontNode> i, _load_font_nodes) { + BOOST_FOREACH (shared_ptr<SMPTELoadFontNode> i, _load_font_nodes) { list<Font>::const_iterator j = _fonts.begin (); while (j != _fonts.end() && j->load_id != i->id) { ++j; @@ -374,7 +374,7 @@ SMPTESubtitleAsset::add_font (string load_id, boost::filesystem::path file) } void -SMPTESubtitleAsset::add (dcp::SubtitleString s) +SMPTESubtitleAsset::add (SubtitleString s) { SubtitleAsset::add (s); _intrinsic_duration = latest_subtitle_out().as_editable_units (_edit_rate.numerator / _edit_rate.denominator); diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h index a7adee6f..a57af44a 100644 --- a/src/smpte_subtitle_asset.h +++ b/src/smpte_subtitle_asset.h @@ -33,6 +33,7 @@ namespace ASDCP { } namespace dcp { +namespace dc { class SMPTELoadFontNode; @@ -159,3 +160,4 @@ private: }; } +} diff --git a/src/sound_asset.cc b/src/sound_asset.cc index f95b860f..9f23782f 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -41,7 +41,7 @@ using std::ostream; using std::vector; using std::list; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; SoundAsset::SoundAsset (boost::filesystem::path file) : Asset (file) diff --git a/src/sound_asset.h b/src/sound_asset.h index 968f7dde..d2d003e7 100644 --- a/src/sound_asset.h +++ b/src/sound_asset.h @@ -28,8 +28,8 @@ #include "types.h" #include "metadata.h" -namespace dcp -{ +namespace dcp { +namespace dc { class SoundFrame; class SoundAssetWriter; @@ -86,5 +86,6 @@ private: }; } +} #endif diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index f1e17615..5b76c0df 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -26,7 +26,7 @@ using std::min; using std::max; -using namespace dcp; +using namespace dcp::dc; struct SoundAssetWriter::ASDCPState { diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h index 468d64be..5856a988 100644 --- a/src/sound_asset_writer.h +++ b/src/sound_asset_writer.h @@ -27,6 +27,7 @@ #include <boost/filesystem.hpp> namespace dcp { +namespace dc { class SoundFrame; class SoundAsset; @@ -65,3 +66,4 @@ private: }; } +} diff --git a/src/sound_frame.cc b/src/sound_frame.cc index 166ac584..a3b40e09 100644 --- a/src/sound_frame.cc +++ b/src/sound_frame.cc @@ -27,7 +27,7 @@ #include "KM_fileio.h" using namespace std; -using namespace dcp; +using namespace dcp::dc; SoundFrame::SoundFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext* c) { diff --git a/src/sound_frame.h b/src/sound_frame.h index 4fdc39e5..b6dfca95 100644 --- a/src/sound_frame.h +++ b/src/sound_frame.h @@ -37,6 +37,7 @@ namespace ASDCP { } namespace dcp { +namespace dc { /** @class SoundFrame * @brief One ‘frame’ of sound data from a SoundAsset. @@ -56,5 +57,6 @@ private: }; } +} #endif diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index e2494be6..491a30f4 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -29,7 +29,7 @@ using std::pair; using std::make_pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file) : PictureAsset (file) diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h index 533be758..73864b41 100644 --- a/src/stereo_picture_asset.h +++ b/src/stereo_picture_asset.h @@ -23,6 +23,7 @@ #include "picture_asset.h" namespace dcp { +namespace dc { /** A 3D (stereoscopic) picture asset */ class StereoPictureAsset : public PictureAsset @@ -44,5 +45,6 @@ public: }; } +} #endif diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc index 322c7b00..13793416 100644 --- a/src/stereo_picture_asset_writer.cc +++ b/src/stereo_picture_asset_writer.cc @@ -30,7 +30,7 @@ using std::istream; using std::ostream; using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase { @@ -48,7 +48,7 @@ StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::fi void StereoPictureAssetWriter::start (uint8_t* data, int size) { - dcp::start (this, _state, _standard, _picture_asset, data, size); + dcp::dc::start (this, _state, _standard, _picture_asset, data, size); _picture_asset->set_frame_rate (Fraction (_picture_asset->edit_rate().numerator * 2, _picture_asset->edit_rate().denominator)); } diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h index 24f35ef4..7e3991b7 100644 --- a/src/stereo_picture_asset_writer.h +++ b/src/stereo_picture_asset_writer.h @@ -26,6 +26,7 @@ #include <fstream> namespace dcp { +namespace dc { /** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame, * rather than giving libdcp all the frames in one go). @@ -61,7 +62,8 @@ private: struct ASDCPState; boost::shared_ptr<ASDCPState> _state; - dcp::Eye _next_eye; + Eye _next_eye; }; } +} diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index 0c4aaadf..9176749c 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -32,7 +32,7 @@ using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; /** Make a picture frame from a 3D (stereoscopic) asset. * @param mxf_path Path to the asset's MXF file. diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h index 5be764fe..49fa5099 100644 --- a/src/stereo_picture_frame.h +++ b/src/stereo_picture_frame.h @@ -31,6 +31,7 @@ namespace ASDCP { } namespace dcp { +namespace dc { class OpenJPEGImage; @@ -57,3 +58,6 @@ private: }; } +} + + diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 5074c35b..260ca52d 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -45,7 +45,7 @@ using boost::shared_ptr; using boost::shared_array; using boost::optional; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; SubtitleAsset::SubtitleAsset () { @@ -61,8 +61,8 @@ SubtitleAsset::SubtitleAsset (boost::filesystem::path file) void SubtitleAsset::parse_subtitles ( shared_ptr<cxml::Document> xml, - list<shared_ptr<dcp::FontNode> > font_nodes, - list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes + list<shared_ptr<FontNode> > font_nodes, + list<shared_ptr<SubtitleNode> > subtitle_nodes ) { /* Make Subtitle objects to represent the raw XML nodes in a sane way */ @@ -74,11 +74,11 @@ SubtitleAsset::parse_subtitles ( void SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, - list<shared_ptr<dcp::SubtitleNode> > const & subtitle_nodes, + list<shared_ptr<SubtitleNode> > const & subtitle_nodes, ParseState& parse_state ) { - BOOST_FOREACH (shared_ptr<dcp::SubtitleNode> i, subtitle_nodes) { + BOOST_FOREACH (shared_ptr<SubtitleNode> i, subtitle_nodes) { parse_state.subtitle_nodes.push_back (i); examine_nodes (xml, i->text_nodes, parse_state); examine_nodes (xml, i->font_nodes, parse_state); @@ -89,11 +89,11 @@ SubtitleAsset::examine_nodes ( void SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, - list<shared_ptr<dcp::FontNode> > const & font_nodes, + list<shared_ptr<FontNode> > const & font_nodes, ParseState& parse_state ) { - BOOST_FOREACH (shared_ptr<dcp::FontNode> i, font_nodes) { + BOOST_FOREACH (shared_ptr<FontNode> i, font_nodes) { parse_state.font_nodes.push_back (i); maybe_add_subtitle (i->text, parse_state); @@ -109,11 +109,11 @@ SubtitleAsset::examine_nodes ( void SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, - list<shared_ptr<dcp::TextNode> > const & text_nodes, + list<shared_ptr<TextNode> > const & text_nodes, ParseState& parse_state ) { - BOOST_FOREACH (shared_ptr<dcp::TextNode> i, text_nodes) { + BOOST_FOREACH (shared_ptr<TextNode> i, text_nodes) { parse_state.text_nodes.push_back (i); maybe_add_subtitle (i->text, parse_state); examine_nodes (xml, i->font_nodes, parse_state); @@ -135,15 +135,15 @@ SubtitleAsset::maybe_add_subtitle (string text, ParseState const & parse_state) DCP_ASSERT (!parse_state.text_nodes.empty ()); DCP_ASSERT (!parse_state.subtitle_nodes.empty ()); - dcp::FontNode effective_font (parse_state.font_nodes); - dcp::TextNode effective_text (*parse_state.text_nodes.back ()); - dcp::SubtitleNode effective_subtitle (*parse_state.subtitle_nodes.back ()); + FontNode effective_font (parse_state.font_nodes); + TextNode effective_text (*parse_state.text_nodes.back ()); + SubtitleNode effective_subtitle (*parse_state.subtitle_nodes.back ()); _subtitles.push_back ( SubtitleString ( effective_font.id, effective_font.italic.get_value_or (false), - effective_font.colour.get_value_or (dcp::Colour (255, 255, 255)), + effective_font.colour.get_value_or (Colour (255, 255, 255)), effective_font.size, effective_font.aspect_adjust.get_value_or (1.0), effective_subtitle.in, @@ -154,7 +154,7 @@ SubtitleAsset::maybe_add_subtitle (string text, ParseState const & parse_state) effective_text.v_align, text, effective_font.effect.get_value_or (NONE), - effective_font.effect_colour.get_value_or (dcp::Colour (0, 0, 0)), + effective_font.effect_colour.get_value_or (Colour (0, 0, 0)), effective_subtitle.fade_up_time, effective_subtitle.fade_down_time ) diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index d3f186ef..c8af5ab5 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -35,8 +35,8 @@ namespace xmlpp { struct interop_dcp_font_test; struct smpte_dcp_font_test; -namespace dcp -{ +namespace dcp { +namespace dc { class SubtitleString; class FontNode; @@ -152,5 +152,6 @@ private: }; } +} #endif diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc index e221b43b..2bf8b144 100644 --- a/src/subtitle_node.cc +++ b/src/subtitle_node.cc @@ -29,7 +29,7 @@ using std::list; using boost::optional; using boost::shared_ptr; using boost::lexical_cast; -using namespace dcp; +using namespace dcp::dc; SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr, string font_id_attribute) { diff --git a/src/subtitle_node.h b/src/subtitle_node.h index 78861050..ed1c4100 100644 --- a/src/subtitle_node.h +++ b/src/subtitle_node.h @@ -30,6 +30,7 @@ namespace cxml { } namespace dcp { +namespace dc { class FontNode; class TextNode; @@ -52,5 +53,6 @@ private: }; } +} #endif diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc index d565d453..c9cc8053 100644 --- a/src/subtitle_string.cc +++ b/src/subtitle_string.cc @@ -24,7 +24,7 @@ using std::string; using std::ostream; using boost::optional; -using namespace dcp; +using namespace dcp::dc; /** @param v_position Vertical position as a fraction of the screen height (between 0 and 1) from v_align */ SubtitleString::SubtitleString ( @@ -77,7 +77,7 @@ SubtitleString::size_in_pixels (int screen_height) const } bool -dcp::operator== (SubtitleString const & a, SubtitleString const & b) +dcp::dc::operator== (SubtitleString const & a, SubtitleString const & b) { return ( a.font() == b.font() && @@ -100,7 +100,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b) } ostream& -dcp::operator<< (ostream& s, SubtitleString const & sub) +dcp::dc::operator<< (ostream& s, SubtitleString const & sub) { s << "\n`" << sub.text() << "' from " << sub.in() << " to " << sub.out() << ";\n" << "fade up " << sub.fade_up_time() << ", fade down " << sub.fade_down_time() << ";\n" diff --git a/src/subtitle_string.h b/src/subtitle_string.h index 2317af5f..ccd844c9 100644 --- a/src/subtitle_string.h +++ b/src/subtitle_string.h @@ -30,6 +30,7 @@ #include <string> namespace dcp { +namespace dc { /** @class SubtitleString * @brief A single line of subtitle text with all the associated attributes. @@ -192,5 +193,6 @@ bool operator== (SubtitleString const & a, SubtitleString const & b); std::ostream& operator<< (std::ostream& s, SubtitleString const & sub); } +} #endif diff --git a/src/text_node.cc b/src/text_node.cc index aa318ce7..8bc31107 100644 --- a/src/text_node.cc +++ b/src/text_node.cc @@ -31,7 +31,7 @@ using std::string; using std::list; using boost::shared_ptr; using boost::optional; -using namespace dcp; +using namespace dcp::dc; /** Read a <Text> node from a subtitle XML file, noting its contents * in this object's member variables. diff --git a/src/text_node.h b/src/text_node.h index f10d7c4b..adf31f1d 100644 --- a/src/text_node.h +++ b/src/text_node.h @@ -31,6 +31,7 @@ namespace cxml { } namespace dcp { +namespace dc { class FontNode; @@ -59,3 +60,4 @@ public: }; } +} diff --git a/src/transfer_function.cc b/src/transfer_function.cc index bdd7ae9f..dda1a6d0 100644 --- a/src/transfer_function.cc +++ b/src/transfer_function.cc @@ -25,7 +25,7 @@ using std::map; using std::pair; using std::make_pair; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; TransferFunction::~TransferFunction () { diff --git a/src/transfer_function.h b/src/transfer_function.h index c8248cce..c77100b0 100644 --- a/src/transfer_function.h +++ b/src/transfer_function.h @@ -30,6 +30,7 @@ #include <map> namespace dcp { +namespace dc { /** @class TransferFunction * @brief A transfer function represented by a lookup table. @@ -55,5 +56,6 @@ private: }; } +} #endif diff --git a/src/types.cc b/src/types.cc index 687e90f8..219dd9fa 100644 --- a/src/types.cc +++ b/src/types.cc @@ -27,7 +27,7 @@ #include <iomanip> using namespace std; -using namespace dcp; +using namespace dcp::dc; using namespace boost; /** Construct a Fraction from a string of the form <numerator> <denominator> @@ -51,19 +51,19 @@ Fraction::as_string () const } bool -dcp::operator== (Fraction const & a, Fraction const & b) +dcp::dc::operator== (Fraction const & a, Fraction const & b) { return (a.numerator == b.numerator && a.denominator == b.denominator); } bool -dcp::operator!= (Fraction const & a, Fraction const & b) +dcp::dc::operator!= (Fraction const & a, Fraction const & b) { return (a.numerator != b.numerator || a.denominator != b.denominator); } ostream& -dcp::operator<< (ostream& s, Fraction const & f) +dcp::dc::operator<< (ostream& s, Fraction const & f) { s << f.numerator << "/" << f.denominator; return s; @@ -124,7 +124,7 @@ Colour::to_argb_string () const * @param b Second colour to compare. */ bool -dcp::operator== (Colour const & a, Colour const & b) +dcp::dc::operator== (Colour const & a, Colour const & b) { return (a.r == b.r && a.g == b.g && a.b == b.b); } @@ -134,20 +134,20 @@ dcp::operator== (Colour const & a, Colour const & b) * @param b Second colour to compare. */ bool -dcp::operator!= (Colour const & a, Colour const & b) +dcp::dc::operator!= (Colour const & a, Colour const & b) { return !(a == b); } ostream & -dcp::operator<< (ostream& s, Colour const & c) +dcp::dc::operator<< (ostream& s, Colour const & c) { s << "(" << c.r << ", " << c.g << ", " << c.b << ")"; return s; } string -dcp::effect_to_string (Effect e) +dcp::dc::effect_to_string (Effect e) { switch (e) { case NONE: @@ -162,7 +162,7 @@ dcp::effect_to_string (Effect e) } Effect -dcp::string_to_effect (string s) +dcp::dc::string_to_effect (string s) { if (s == "none") { return NONE; @@ -176,7 +176,7 @@ dcp::string_to_effect (string s) } string -dcp::halign_to_string (HAlign h) +dcp::dc::halign_to_string (HAlign h) { switch (h) { case HALIGN_LEFT: @@ -191,7 +191,7 @@ dcp::halign_to_string (HAlign h) } HAlign -dcp::string_to_halign (string s) +dcp::dc::string_to_halign (string s) { if (s == "left") { return HALIGN_LEFT; @@ -205,7 +205,7 @@ dcp::string_to_halign (string s) } string -dcp::valign_to_string (VAlign v) +dcp::dc::valign_to_string (VAlign v) { switch (v) { case VALIGN_TOP: @@ -220,7 +220,7 @@ dcp::valign_to_string (VAlign v) } VAlign -dcp::string_to_valign (string s) +dcp::dc::string_to_valign (string s) { if (s == "top") { return VALIGN_TOP; diff --git a/src/types.h b/src/types.h index 16000daa..7ef1859e 100644 --- a/src/types.h +++ b/src/types.h @@ -28,8 +28,8 @@ #include <boost/function.hpp> #include <string> -namespace dcp -{ +namespace dcp { +namespace dc { /** @struct Size * @brief The integer, two-dimensional size of something. @@ -240,5 +240,6 @@ const float ASPECT_ADJUST_EPSILON = 1e-3; const float ALIGN_EPSILON = 1e-3; } +} #endif diff --git a/src/util.cc b/src/util.cc index b9c21dc5..6519f11f 100644 --- a/src/util.cc +++ b/src/util.cc @@ -61,13 +61,13 @@ using boost::shared_array; using boost::optional; using boost::function; using boost::algorithm::trim; -using namespace dcp; +using namespace dcp::dc; /** Create a UUID. * @return UUID. */ string -dcp::make_uuid () +dcp::dc::make_uuid () { char buffer[64]; Kumu::UUID id; @@ -84,7 +84,7 @@ dcp::make_uuid () * @return Digest. */ string -dcp::make_digest (boost::filesystem::path filename, function<void (float)> progress) +dcp::dc::make_digest (boost::filesystem::path filename, function<void (float)> progress) { Kumu::FileReader reader; Kumu::Result_t r = reader.OpenRead (filename.string().c_str ()); @@ -131,7 +131,7 @@ dcp::make_digest (boost::filesystem::path filename, function<void (float)> progr * @return string. */ string -dcp::content_kind_to_string (ContentKind kind) +dcp::dc::content_kind_to_string (ContentKind kind) { switch (kind) { case FEATURE: @@ -164,8 +164,8 @@ dcp::content_kind_to_string (ContentKind kind) * @param kind Content kind string. * @return libdcp ContentKind. */ -dcp::ContentKind -dcp::content_kind_from_string (string kind) +dcp::dc::ContentKind +dcp::dc::content_kind_from_string (string kind) { transform (kind.begin(), kind.end(), kind.begin(), ::tolower); @@ -198,7 +198,7 @@ dcp::content_kind_from_string (string kind) * @return true if the string contains only space, newline or tab characters, or is empty. */ bool -dcp::empty_or_white_space (string s) +dcp::dc::empty_or_white_space (string s) { for (size_t i = 0; i < s.length(); ++i) { if (s[i] != ' ' && s[i] != '\n' && s[i] != '\t') { @@ -213,7 +213,7 @@ dcp::empty_or_white_space (string s) * by client applications. */ void -dcp::init () +dcp::dc::init () { if (xmlSecInit() < 0) { throw MiscError ("could not initialise xmlsec"); @@ -234,17 +234,17 @@ dcp::init () } } -bool dcp::operator== (dcp::Size const & a, dcp::Size const & b) +bool dcp::dc::operator== (Size const & a, Size const & b) { return (a.width == b.width && a.height == b.height); } -bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b) +bool dcp::dc::operator!= (Size const & a, Size const & b) { return !(a == b); } -ostream& dcp::operator<< (ostream& s, dcp::Size const & a) +ostream& dcp::dc::operator<< (ostream& s, Size const & a) { s << a.width << "x" << a.height; return s; @@ -260,7 +260,7 @@ ostream& dcp::operator<< (ostream& s, dcp::Size const & a) * @return Number of characters written to the output buffer. */ int -dcp::base64_decode (string const & in, unsigned char* out, int out_length) +dcp::dc::base64_decode (string const & in, unsigned char* out, int out_length) { BIO* b64 = BIO_new (BIO_f_base64 ()); @@ -293,7 +293,7 @@ dcp::base64_decode (string const & in, unsigned char* out, int out_length) * with this wrapper. */ FILE * -dcp::fopen_boost (boost::filesystem::path p, string t) +dcp::dc::fopen_boost (boost::filesystem::path p, string t) { #ifdef LIBDCP_WINDOWS wstring w (t.begin(), t.end()); @@ -305,7 +305,7 @@ dcp::fopen_boost (boost::filesystem::path p, string t) } optional<boost::filesystem::path> -dcp::relative_to_root (boost::filesystem::path root, boost::filesystem::path file) +dcp::dc::relative_to_root (boost::filesystem::path root, boost::filesystem::path file) { boost::filesystem::path::const_iterator i = root.begin (); boost::filesystem::path::const_iterator j = file.begin (); @@ -328,7 +328,7 @@ dcp::relative_to_root (boost::filesystem::path root, boost::filesystem::path fil } bool -dcp::ids_equal (string a, string b) +dcp::dc::ids_equal (string a, string b) { transform (a.begin(), a.end(), a.begin(), ::tolower); transform (b.begin(), b.end(), b.begin(), ::tolower); @@ -338,7 +338,7 @@ dcp::ids_equal (string a, string b) } string -dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length) +dcp::dc::file_to_string (boost::filesystem::path p, uintmax_t max_length) { uintmax_t len = boost::filesystem::file_size (p); if (len > max_length) { @@ -365,7 +365,7 @@ dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length) * @return SHA1 fingerprint of key */ string -dcp::private_key_fingerprint (string key) +dcp::dc::private_key_fingerprint (string key) { boost::replace_all (key, "-----BEGIN RSA PRIVATE KEY-----\n", ""); boost::replace_all (key, "\n-----END RSA PRIVATE KEY-----\n", ""); @@ -384,7 +384,7 @@ dcp::private_key_fingerprint (string key) } xmlpp::Node * -dcp::find_child (xmlpp::Node const * node, string name) +dcp::dc::find_child (xmlpp::Node const * node, string name) { xmlpp::Node::NodeList c = node->get_children (); xmlpp::Node::NodeList::iterator i = c.begin(); @@ -397,7 +397,7 @@ dcp::find_child (xmlpp::Node const * node, string name) } string -dcp::remove_urn_uuid (string raw) +dcp::dc::remove_urn_uuid (string raw) { DCP_ASSERT (raw.substr(0, 9) == "urn:uuid:"); return raw.substr (9); @@ -39,6 +39,7 @@ namespace xmlpp { } namespace dcp { +namespace dc { class ARGBImage; class CertificateChain; @@ -66,5 +67,6 @@ extern std::string private_key_fingerprint (std::string key); extern xmlpp::Node* find_child (xmlpp::Node const * node, std::string name); } +} #endif diff --git a/src/version.h b/src/version.h index c57f38a1..effbb630 100644 --- a/src/version.h +++ b/src/version.h @@ -18,9 +18,11 @@ */ namespace dcp { +namespace dc { extern char const * version; extern char const * git_commit; extern bool const built_with_debug; } +} @@ -23,8 +23,8 @@ #include "exceptions.h" #include <libcxml/cxml.h> -namespace dcp -{ +namespace dcp { +namespace dc { template <class T> boost::shared_ptr<T> @@ -87,5 +87,6 @@ type_grand_children (boost::shared_ptr<const cxml::Node> node, std::string name, } } +} #endif diff --git a/test/asset_test.cc b/test/asset_test.cc index c53aca68..f271f01a 100644 --- a/test/asset_test.cc +++ b/test/asset_test.cc @@ -23,16 +23,16 @@ using std::string; using boost::shared_ptr; -class DummyAsset : public dcp::Asset +class DummyAsset : public dcp::dc::Asset { protected: - std::string pkl_type (dcp::Standard standard) const { + std::string pkl_type (dcp::dc::Standard) const { return "none"; } }; static void -note_handler (dcp::NoteType, string) +note_handler (dcp::dc::NoteType, string) { } @@ -45,11 +45,11 @@ BOOST_AUTO_TEST_CASE (asset_test) shared_ptr<DummyAsset> b (new DummyAsset); b->_hash = "def"; - BOOST_CHECK (!a->equals (b, dcp::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); + BOOST_CHECK (!a->equals (b, dcp::dc::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); b->_hash = "abc"; - BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); + BOOST_CHECK (a->equals (b, dcp::dc::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); b->_file = "foo/bar/baz"; - BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); + BOOST_CHECK (a->equals (b, dcp::dc::EqualityOptions (), boost::bind (¬e_handler, _1, _2))); } diff --git a/test/bench.cc b/test/bench.cc index de8c4369..863fb7b6 100644 --- a/test/bench.cc +++ b/test/bench.cc @@ -74,18 +74,18 @@ main (int argc, char* argv[]) int const count = 100; int const j2k_bandwidth = 100000000; - dcp::Data j2k (boost::filesystem::path (argv[1]) / "thx.j2c"); + dcp::dc::Data j2k (boost::filesystem::path (argv[1]) / "thx.j2c"); Timer decompress; Timer compress; - dcp::Data recomp; + dcp::dc::Data recomp; for (int i = 0; i < count; ++i) { decompress.start (); - shared_ptr<dcp::OpenJPEGImage> xyz = dcp::decompress_j2k (j2k, 0); + shared_ptr<dcp::dc::OpenJPEGImage> xyz = dcp::dc::decompress_j2k (j2k, 0); decompress.stop (); compress.start (); - recomp = dcp::compress_j2k (xyz, j2k_bandwidth, 24, false, false); + recomp = dcp::dc::compress_j2k (xyz, j2k_bandwidth, 24, false, false); compress.stop (); cout << (i + 1) << " "; cout.flush (); diff --git a/test/certificates_test.cc b/test/certificates_test.cc index 9592ae2f..596ac0a6 100644 --- a/test/certificates_test.cc +++ b/test/certificates_test.cc @@ -31,15 +31,15 @@ using boost::shared_ptr; /** Check that loading certificates from files via strings works */ BOOST_AUTO_TEST_CASE (certificates1) { - dcp::CertificateChain c; + dcp::dc::CertificateChain c; - c.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - c.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - c.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + c.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + c.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + c.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - dcp::CertificateChain::List leaf_to_root = c.leaf_to_root (); + dcp::dc::CertificateChain::List leaf_to_root = c.leaf_to_root (); - dcp::CertificateChain::List::iterator i = leaf_to_root.begin (); + dcp::dc::CertificateChain::List::iterator i = leaf_to_root.begin (); /* Leaf */ BOOST_CHECK_EQUAL (*i, c.leaf ()); @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (certificates1) ); /* Check that reconstruction from a string works */ - dcp::Certificate test (c.root().certificate (true)); + dcp::dc::Certificate test (c.root().certificate (true)); BOOST_CHECK_EQUAL (test.certificate(), c.root().certificate()); } @@ -92,79 +92,79 @@ BOOST_AUTO_TEST_CASE (certificates1) BOOST_AUTO_TEST_CASE (certificates2) { { - dcp::Certificate c (dcp::file_to_string (private_test / "CA.GDC-TECH.COM_SA2100_A14903.crt.crt")); - BOOST_CHECK_EQUAL (c.certificate(true), dcp::file_to_string (private_test / "CA.GDC-TECH.COM_SA2100_A14903.crt.crt.reformatted")); + dcp::dc::Certificate c (dcp::dc::file_to_string (private_test / "CA.GDC-TECH.COM_SA2100_A14903.crt.crt")); + BOOST_CHECK_EQUAL (c.certificate(true), dcp::dc::file_to_string (private_test / "CA.GDC-TECH.COM_SA2100_A14903.crt.crt.reformatted")); } { - dcp::Certificate c (dcp::file_to_string (private_test / "usl-cert.pem")); - BOOST_CHECK_EQUAL (c.certificate(true), dcp::file_to_string (private_test / "usl-cert.pem.trimmed")); + dcp::dc::Certificate c (dcp::dc::file_to_string (private_test / "usl-cert.pem")); + BOOST_CHECK_EQUAL (c.certificate(true), dcp::dc::file_to_string (private_test / "usl-cert.pem.trimmed")); } - BOOST_CHECK_THROW (dcp::Certificate (dcp::file_to_string (private_test / "no-begin.pem")), dcp::MiscError); - BOOST_CHECK_THROW (dcp::Certificate ("foo"), dcp::MiscError); + BOOST_CHECK_THROW (dcp::dc::Certificate (dcp::dc::file_to_string (private_test / "no-begin.pem")), dcp::dc::MiscError); + BOOST_CHECK_THROW (dcp::dc::Certificate ("foo"), dcp::dc::MiscError); } -/** Check that dcp::CertificateChain::valid() and ::attempt_reorder() basically work */ +/** Check that dcp::dc::CertificateChain::valid() and ::attempt_reorder() basically work */ BOOST_AUTO_TEST_CASE (certificates_validation) { - dcp::CertificateChain good1; - good1.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - good1.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - good1.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + dcp::dc::CertificateChain good1; + good1.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + good1.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + good1.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); BOOST_CHECK (good1.valid ()); - dcp::CertificateChain good2; - good2.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + dcp::dc::CertificateChain good2; + good2.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); BOOST_CHECK (good2.valid ()); - dcp::CertificateChain bad1; - bad1.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - bad1.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + dcp::dc::CertificateChain bad1; + bad1.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + bad1.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); BOOST_CHECK (!bad1.valid ()); BOOST_CHECK (!bad1.attempt_reorder ()); - dcp::CertificateChain bad2; - bad2.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - bad2.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - bad2.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + dcp::dc::CertificateChain bad2; + bad2.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + bad2.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + bad2.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); BOOST_CHECK (!bad2.valid ()); BOOST_CHECK (bad2.attempt_reorder ()); - dcp::CertificateChain bad3; - bad3.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - bad3.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - bad3.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + dcp::dc::CertificateChain bad3; + bad3.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + bad3.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + bad3.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); BOOST_CHECK (!bad3.valid ()); BOOST_CHECK (bad3.attempt_reorder ()); - dcp::CertificateChain bad4; - bad4.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - bad4.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - bad4.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + dcp::dc::CertificateChain bad4; + bad4.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + bad4.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + bad4.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); BOOST_CHECK (!bad4.valid ()); BOOST_CHECK (bad4.attempt_reorder ()); - dcp::CertificateChain bad5; - bad5.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - bad5.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + dcp::dc::CertificateChain bad5; + bad5.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + bad5.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); BOOST_CHECK (!bad5.valid ()); BOOST_CHECK (!bad5.attempt_reorder ()); } -/** Check that dcp::Signer::valid() basically works */ +/** Check that dcp::dc::Signer::valid() basically works */ BOOST_AUTO_TEST_CASE (signer_validation) { /* Check a valid signer */ - dcp::CertificateChain chain; - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - chain.set_key (dcp::file_to_string ("test/ref/crypt/leaf.key")); + dcp::dc::CertificateChain chain; + chain.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + chain.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + chain.add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + chain.set_key (dcp::dc::file_to_string ("test/ref/crypt/leaf.key")); BOOST_CHECK (chain.valid ()); /* Put in an unrelated key and the signer should no longer be valid */ - dcp::CertificateChain another_chain ("openssl"); + dcp::dc::CertificateChain another_chain ("openssl"); chain.set_key (another_chain.key().get ()); BOOST_CHECK (!chain.valid ()); } diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc index d9bf2e77..631de33f 100644 --- a/test/colour_conversion_test.cc +++ b/test/colour_conversion_test.cc @@ -25,7 +25,7 @@ using std::pow; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; static void check_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, bool inverse, float gamma) diff --git a/test/colour_test.cc b/test/colour_test.cc index 7169c177..d180f371 100644 --- a/test/colour_test.cc +++ b/test/colour_test.cc @@ -26,28 +26,28 @@ using std::stringstream; /** Check that dcp::Colour works */ BOOST_AUTO_TEST_CASE (colour) { - dcp::Colour z; + dcp::dc::Colour z; BOOST_CHECK_EQUAL (z.r, 0); BOOST_CHECK_EQUAL (z.g, 0); BOOST_CHECK_EQUAL (z.b, 0); BOOST_CHECK_EQUAL (z.to_argb_string(), "FF000000"); - dcp::Colour c ("FFFF0000"); + dcp::dc::Colour c ("FFFF0000"); BOOST_CHECK_EQUAL (c.r, 255); BOOST_CHECK_EQUAL (c.g, 0); BOOST_CHECK_EQUAL (c.b, 0); BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000"); - dcp::Colour d = dcp::Colour ("FF00FF00"); + dcp::dc::Colour d = dcp::dc::Colour ("FF00FF00"); BOOST_CHECK_EQUAL (d.r, 0); BOOST_CHECK_EQUAL (d.g, 255); BOOST_CHECK_EQUAL (d.b, 0); BOOST_CHECK_EQUAL (d.to_argb_string(), "FF00FF00"); - dcp::Colour e = dcp::Colour ("FF0000FF"); + dcp::dc::Colour e = dcp::dc::Colour ("FF0000FF"); BOOST_CHECK_EQUAL (e.r, 0); BOOST_CHECK_EQUAL (e.g, 0); @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (colour) BOOST_CHECK (c != d); - BOOST_CHECK_THROW (dcp::Colour ("001234"), dcp::XMLError); + BOOST_CHECK_THROW (dcp::dc::Colour ("001234"), dcp::dc::XMLError); stringstream s; s << c; diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc index 92e38a00..2fd2134b 100644 --- a/test/cpl_sar_test.cc +++ b/test/cpl_sar_test.cc @@ -30,28 +30,28 @@ using boost::shared_ptr; */ BOOST_AUTO_TEST_CASE (cpl_sar) { - shared_ptr<dcp::ReelMonoPictureAsset> pa ( - new dcp::ReelMonoPictureAsset ( - shared_ptr<dcp::MonoPictureAsset> (new dcp::MonoPictureAsset ("test/ref/DCP/dcp_test1/video.mxf")), + shared_ptr<dcp::dc::ReelMonoPictureAsset> pa ( + new dcp::dc::ReelMonoPictureAsset ( + shared_ptr<dcp::dc::MonoPictureAsset> (new dcp::dc::MonoPictureAsset ("test/ref/DCP/dcp_test1/video.mxf")), 0 ) ); { - pa->set_screen_aspect_ratio (dcp::Fraction (1998, 1080)); + pa->set_screen_aspect_ratio (dcp::dc::Fraction (1998, 1080)); xmlpp::Document doc; xmlpp::Element* el = doc.create_root_node ("Test"); - pa->write_to_cpl (el, dcp::INTEROP); + pa->write_to_cpl (el, dcp::dc::INTEROP); cxml::Node node (el); BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "1.85"); } { - pa->set_screen_aspect_ratio (dcp::Fraction (2048, 858)); + pa->set_screen_aspect_ratio (dcp::dc::Fraction (2048, 858)); xmlpp::Document doc; xmlpp::Element* el = doc.create_root_node ("Test"); - pa->write_to_cpl (el, dcp::INTEROP); + pa->write_to_cpl (el, dcp::dc::INTEROP); cxml::Node node (el); BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "2.39"); diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc index 9a482f09..c8dc81b8 100644 --- a/test/dcp_font_test.cc +++ b/test/dcp_font_test.cc @@ -38,32 +38,32 @@ using boost::shared_array; BOOST_AUTO_TEST_CASE (interop_dcp_font_test) { boost::filesystem::path directory = "build/test/interop_dcp_font_test"; - dcp::DCP dcp (directory); + dcp::dc::Package dcp (directory); - shared_ptr<dcp::InteropSubtitleAsset> subs (new dcp::InteropSubtitleAsset ()); + shared_ptr<dcp::dc::InteropSubtitleAsset> subs (new dcp::dc::InteropSubtitleAsset ()); subs->add_font ("theFontId", "test/data/dummy.ttf"); subs->write (directory / "frobozz.xml"); check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/dummy.ttf"); - shared_ptr<dcp::Reel> reel (new dcp::Reel ()); - reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0))); + shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); + reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0))); - shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER)); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER)); cpl->add (reel); dcp.add (cpl); - dcp.write_xml (dcp::INTEROP); + dcp.write_xml (dcp::dc::INTEROP); - dcp::DCP dcp2 (directory); + dcp::dc::Package dcp2 (directory); dcp2.read (); - shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> ( + shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> ( dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset() ); BOOST_REQUIRE (subs2); BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1); boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf"); - FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb"); + FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb"); BOOST_REQUIRE (f); shared_array<uint8_t> ref (new uint8_t[size]); fread (ref.get(), 1, size, f); @@ -76,31 +76,31 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test) BOOST_AUTO_TEST_CASE (smpte_dcp_font_test) { boost::filesystem::path directory = "build/test/smpte_dcp_font_test"; - dcp::DCP dcp (directory); + dcp::dc::Package dcp (directory); - shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset ()); + shared_ptr<dcp::dc::SMPTESubtitleAsset> subs (new dcp::dc::SMPTESubtitleAsset ()); subs->add_font ("theFontId", "test/data/dummy.ttf"); subs->write (directory / "frobozz.mxf"); - shared_ptr<dcp::Reel> reel (new dcp::Reel ()); - reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0))); + shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); + reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0))); - shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER)); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER)); cpl->add (reel); dcp.add (cpl); - dcp.write_xml (dcp::SMPTE); + dcp.write_xml (dcp::dc::SMPTE); - dcp::DCP dcp2 (directory); + dcp::dc::Package dcp2 (directory); dcp2.read (); - shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> ( + shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> ( dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset() ); BOOST_REQUIRE (subs2); BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1); boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf"); - FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb"); + FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb"); BOOST_REQUIRE (f); shared_array<uint8_t> ref (new uint8_t[size]); fread (ref.get(), 1, size, f); diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 4a6cb429..6c5af703 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -44,11 +44,11 @@ BOOST_AUTO_TEST_CASE (dcp_test1) Kumu::libdcp_test = true; /* Some known metadata */ - dcp::XMLMetadata xml_meta; + dcp::dc::XMLMetadata xml_meta; xml_meta.issuer = "OpenDCP 0.0.25"; xml_meta.creator = "OpenDCP 0.0.25"; xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; - dcp::MXFMetadata mxf_meta; + dcp::dc::MXFMetadata mxf_meta; mxf_meta.company_name = "OpenDCP"; mxf_meta.product_name = "OpenDCP"; mxf_meta.product_version = "0.0.25"; @@ -56,24 +56,24 @@ BOOST_AUTO_TEST_CASE (dcp_test1) /* We're making build/test/DCP/dcp_test1 */ boost::filesystem::remove_all ("build/test/DCP/dcp_test1"); boost::filesystem::create_directories ("build/test/DCP/dcp_test1"); - dcp::DCP d ("build/test/DCP/dcp_test1"); - shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); + dcp::dc::Package d ("build/test/DCP/dcp_test1"); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE)); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_metadata (xml_meta); - shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr<dcp::dc::MonoPictureAsset> mp (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); mp->set_metadata (mxf_meta); - shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::dc::SMPTE, false); + dcp::dc::File j2c ("test/data/32x32_red_square.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)); + shared_ptr<dcp::dc::SoundAsset> ms (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 1)); ms->set_metadata (mxf_meta); - shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE); + shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::dc::SMPTE); SF_INFO info; info.format = 0; @@ -92,17 +92,17 @@ BOOST_AUTO_TEST_CASE (dcp_test1) sound_writer->finalize (); - cpl->add (shared_ptr<dcp::Reel> ( - new dcp::Reel ( - shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr<dcp::ReelSubtitleAsset> () + cpl->add (shared_ptr<dcp::dc::Reel> ( + new dcp::dc::Reel ( + shared_ptr<dcp::dc::ReelMonoPictureAsset> (new dcp::dc::ReelMonoPictureAsset (mp, 0)), + shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (ms, 0)), + shared_ptr<dcp::dc::ReelSubtitleAsset> () ) )); d.add (cpl); - d.write_xml (dcp::SMPTE, xml_meta); + d.write_xml (dcp::dc::SMPTE, xml_meta); /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */ } @@ -113,11 +113,11 @@ BOOST_AUTO_TEST_CASE (dcp_test2) Kumu::libdcp_test = true; /* Some known metadata */ - dcp::XMLMetadata xml_meta; + dcp::dc::XMLMetadata xml_meta; xml_meta.issuer = "OpenDCP 0.0.25"; xml_meta.creator = "OpenDCP 0.0.25"; xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; - dcp::MXFMetadata mxf_meta; + dcp::dc::MXFMetadata mxf_meta; mxf_meta.company_name = "OpenDCP"; mxf_meta.product_name = "OpenDCP"; mxf_meta.product_version = "0.0.25"; @@ -125,16 +125,16 @@ BOOST_AUTO_TEST_CASE (dcp_test2) /* We're making build/test/DCP/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)); + dcp::dc::Package d ("build/test/DCP/dcp_test2"); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE)); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_metadata (xml_meta); - shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr<dcp::dc::StereoPictureAsset> mp (new dcp::dc::StereoPictureAsset (dcp::dc::Fraction (24, 1))); mp->set_metadata (mxf_meta); - shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::SMPTE, false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::dc::SMPTE, false); + dcp::dc::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { /* Left */ picture_writer->write (j2c.data (), j2c.size ()); @@ -143,9 +143,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2) } picture_writer->finalize (); - shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1)); + shared_ptr<dcp::dc::SoundAsset> ms (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 1)); ms->set_metadata (mxf_meta); - shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE); + shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::dc::SMPTE); SF_INFO info; info.format = 0; @@ -164,23 +164,23 @@ 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)), - shared_ptr<dcp::ReelSubtitleAsset> () + cpl->add (shared_ptr<dcp::dc::Reel> ( + new dcp::dc::Reel ( + shared_ptr<dcp::dc::ReelStereoPictureAsset> (new dcp::dc::ReelStereoPictureAsset (mp, 0)), + shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (ms, 0)), + shared_ptr<dcp::dc::ReelSubtitleAsset> () ) )); d.add (cpl); - d.write_xml (dcp::SMPTE, xml_meta); + d.write_xml (dcp::dc::SMPTE, xml_meta); /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run-tests.sh */ } static void -note (dcp::NoteType, string) +note (dcp::dc::NoteType, string) { } @@ -188,22 +188,22 @@ note (dcp::NoteType, string) /** Test comparison of a DCP with itself */ BOOST_AUTO_TEST_CASE (dcp_test3) { - dcp::DCP A ("test/ref/DCP/dcp_test1"); + dcp::dc::Package A ("test/ref/DCP/dcp_test1"); A.read (); - dcp::DCP B ("test/ref/DCP/dcp_test1"); + dcp::dc::Package B ("test/ref/DCP/dcp_test1"); B.read (); - BOOST_CHECK (A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2))); + BOOST_CHECK (A.equals (B, dcp::dc::EqualityOptions(), boost::bind (¬e, _1, _2))); } /** Test comparison of a DCP with a different DCP */ BOOST_AUTO_TEST_CASE (dcp_test4) { - dcp::DCP A ("test/ref/DCP/dcp_test1"); + dcp::dc::Package A ("test/ref/DCP/dcp_test1"); A.read (); - dcp::DCP B ("test/ref/DCP/dcp_test2"); + dcp::dc::Package B ("test/ref/DCP/dcp_test2"); B.read (); - BOOST_CHECK (!A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2))); + BOOST_CHECK (!A.equals (B, dcp::dc::EqualityOptions(), boost::bind (¬e, _1, _2))); } diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 61b38ec4..73035809 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -24,80 +24,80 @@ BOOST_AUTO_TEST_CASE (dcp_time) { /* tcr of 250 makes the editable event length the same as an Interop `tick' */ - dcp::Time t (977143, 24, 250); + dcp::dc::Time t (977143, 24, 250); BOOST_CHECK_EQUAL (t.e, 73); BOOST_CHECK_EQUAL (t.s, 34); BOOST_CHECK_EQUAL (t.m, 18); BOOST_CHECK_EQUAL (t.h, 11); - BOOST_CHECK_EQUAL (t.as_string(dcp::INTEROP), "11:18:34:073"); + BOOST_CHECK_EQUAL (t.as_string(dcp::dc::INTEROP), "11:18:34:073"); /* Use a tcr of 24 so that the editable event is a frame */ - dcp::Time a (3, 2, 3, 4, 24); - dcp::Time b (2, 3, 4, 5, 24); + dcp::dc::Time a (3, 2, 3, 4, 24); + dcp::dc::Time b (2, 3, 4, 5, 24); - dcp::Time r = a - b; + dcp::dc::Time r = a - b; BOOST_CHECK_EQUAL (r.h, 0); BOOST_CHECK_EQUAL (r.m, 58); BOOST_CHECK_EQUAL (r.s, 58); BOOST_CHECK_EQUAL (r.e, 23); - BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "00:58:58:023"); + BOOST_CHECK_EQUAL (r.as_string(dcp::dc::INTEROP), "00:58:58:023"); /* Different tcr (25) */ - a = dcp::Time (1, 58, 56, 2, 25); - b = dcp::Time (1, 7, 12, 1, 25); + a = dcp::dc::Time (1, 58, 56, 2, 25); + b = dcp::dc::Time (1, 7, 12, 1, 25); r = a + b; BOOST_CHECK_EQUAL (r.h, 3); BOOST_CHECK_EQUAL (r.m, 6); BOOST_CHECK_EQUAL (r.s, 8); BOOST_CHECK_EQUAL (r.e, 3); - BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "03:06:08:003"); + BOOST_CHECK_EQUAL (r.as_string(dcp::dc::INTEROP), "03:06:08:003"); /* Another arbitrary tcr (30) */ - a = dcp::Time (24, 12, 6, 3, 30); - b = dcp::Time (16, 8, 4, 2, 30); + a = dcp::dc::Time (24, 12, 6, 3, 30); + b = dcp::dc::Time (16, 8, 4, 2, 30); BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5); - a = dcp::Time (3600 * 24, 24, 250); + a = dcp::dc::Time (3600 * 24, 24, 250); BOOST_CHECK_EQUAL (a.h, 1); BOOST_CHECK_EQUAL (a.m, 0); BOOST_CHECK_EQUAL (a.s, 0); BOOST_CHECK_EQUAL (a.e, 0); - a = dcp::Time (60 * 24, 24, 250); + a = dcp::dc::Time (60 * 24, 24, 250); BOOST_CHECK_EQUAL (a.h, 0); BOOST_CHECK_EQUAL (a.m, 1); BOOST_CHECK_EQUAL (a.s, 0); BOOST_CHECK_EQUAL (a.e, 0); /* Check rounding; 3424 is 142.666666666... seconds or 0.166666666... ticks */ - a = dcp::Time (3424, 24, 250); + a = dcp::dc::Time (3424, 24, 250); BOOST_CHECK_EQUAL (a.h, 0); BOOST_CHECK_EQUAL (a.m, 2); BOOST_CHECK_EQUAL (a.s, 22); BOOST_CHECK_EQUAL (a.e, 167); - a = dcp::Time (3425, 24, 250); + a = dcp::dc::Time (3425, 24, 250); BOOST_CHECK_EQUAL (a.h, 0); BOOST_CHECK_EQUAL (a.m, 2); BOOST_CHECK_EQUAL (a.s, 22); BOOST_CHECK_EQUAL (a.e, 177); /* Check addition of times with different tcrs */ - a = dcp::Time (0, 0, 0, 3, 24); - b = dcp::Time (0, 0, 0, 4, 48); + a = dcp::dc::Time (0, 0, 0, 3, 24); + b = dcp::dc::Time (0, 0, 0, 4, 48); r = a + b; - BOOST_CHECK_EQUAL (r, dcp::Time (0, 0, 0, 240, 1152)); + BOOST_CHECK_EQUAL (r, dcp::dc::Time (0, 0, 0, 240, 1152)); /* Check rounding on conversion from seconds */ - BOOST_CHECK_EQUAL (dcp::Time (80.990, 1000), dcp::Time (0, 1, 20, 990, 1000)); + BOOST_CHECK_EQUAL (dcp::dc::Time (80.990, 1000), dcp::dc::Time (0, 1, 20, 990, 1000)); /* Check rebase() */ - a = dcp::Time (1, 58, 56, 2, 25); - BOOST_CHECK_EQUAL (a.rebase (250), dcp::Time (1, 58, 56, 20, 250)); - b = dcp::Time (9, 12, 41, 17, 99); - BOOST_CHECK_EQUAL (b.rebase (250), dcp::Time (9, 12, 41, 42, 250)); + a = dcp::dc::Time (1, 58, 56, 2, 25); + BOOST_CHECK_EQUAL (a.rebase (250), dcp::dc::Time (1, 58, 56, 20, 250)); + b = dcp::dc::Time (9, 12, 41, 17, 99); + BOOST_CHECK_EQUAL (b.rebase (250), dcp::dc::Time (9, 12, 41, 42, 250)); /* We must round down in rebase() */ - a = dcp::Time (0, 2, 57, 999, 1000); - BOOST_CHECK_EQUAL (a.rebase (250), dcp::Time (0, 2, 57, 249, 250)); + a = dcp::dc::Time (0, 2, 57, 999, 1000); + BOOST_CHECK_EQUAL (a.rebase (250), dcp::dc::Time (0, 2, 57, 249, 250)); } diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 2f0bb420..d5bd9eab 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -38,19 +38,19 @@ using boost::dynamic_pointer_cast; using boost::shared_ptr; using boost::scoped_array; -pair<uint8_t*, dcp::Size> -get_frame (dcp::DCP const & dcp) +pair<uint8_t*, dcp::dc::Size> +get_frame (dcp::dc::Package const & dcp) { - shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front (); - shared_ptr<dcp::PictureAsset> picture = reel->main_picture()->asset (); + shared_ptr<const dcp::dc::Reel> reel = dcp.cpls().front()->reels().front (); + shared_ptr<dcp::dc::PictureAsset> picture = reel->main_picture()->asset (); BOOST_CHECK (picture); - shared_ptr<const dcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset> (picture); - shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0); - shared_ptr<dcp::OpenJPEGImage> xyz = j2k_frame->xyz_image(); + shared_ptr<const dcp::dc::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::dc::MonoPictureAsset> (picture); + shared_ptr<const dcp::dc::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0); + shared_ptr<dcp::dc::OpenJPEGImage> xyz = j2k_frame->xyz_image(); uint8_t* argb = new uint8_t[xyz->size().width * xyz->size().height * 4]; - dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb); + dcp::dc::xyz_to_rgba (j2k_frame->xyz_image(), dcp::dc::ColourConversion::srgb_to_xyz(), argb); return make_pair (argb, xyz->size ()); } @@ -59,27 +59,27 @@ BOOST_AUTO_TEST_CASE (decryption_test) { boost::filesystem::path plaintext_path = private_test; plaintext_path /= "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; - dcp::DCP plaintext (plaintext_path.string ()); + dcp::dc::Package plaintext (plaintext_path.string ()); plaintext.read (); BOOST_CHECK_EQUAL (plaintext.encrypted (), false); boost::filesystem::path encrypted_path = private_test; encrypted_path /= "TONEPLATES-SMPTE-ENCRYPTED_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; - dcp::DCP encrypted (encrypted_path.string ()); + dcp::dc::Package encrypted (encrypted_path.string ()); encrypted.read (); BOOST_CHECK_EQUAL (encrypted.encrypted (), true); - dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ( - dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") + dcp::dc::DecryptedKDM kdm ( + dcp::dc::EncryptedKDM ( + dcp::dc::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") ), - dcp::file_to_string ("test/data/private.key") + dcp::dc::file_to_string ("test/data/private.key") ); encrypted.add (kdm); - pair<uint8_t *, dcp::Size> plaintext_frame = get_frame (plaintext); - pair<uint8_t *, dcp::Size> encrypted_frame = get_frame (encrypted); + pair<uint8_t *, dcp::dc::Size> plaintext_frame = get_frame (plaintext); + pair<uint8_t *, dcp::dc::Size> encrypted_frame = get_frame (encrypted); /* Check that plaintext and encrypted are the same */ @@ -101,8 +101,8 @@ BOOST_AUTO_TEST_CASE (decryption_test) /** Load in a KDM that didn't work at first */ BOOST_AUTO_TEST_CASE (failing_kdm_test) { - dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM (dcp::file_to_string ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml")), - dcp::file_to_string ("test/data/private.key") + dcp::dc::DecryptedKDM kdm ( + dcp::dc::EncryptedKDM (dcp::dc::file_to_string ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml")), + dcp::dc::file_to_string ("test/data/private.key") ); } diff --git a/test/effect_test.cc b/test/effect_test.cc index cd1a6c3c..55e208bc 100644 --- a/test/effect_test.cc +++ b/test/effect_test.cc @@ -24,14 +24,14 @@ /** Very simple tests of Effect-related stuff */ BOOST_AUTO_TEST_CASE (effect_test) { - BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::NONE), "none"); - BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::BORDER), "border"); - BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::SHADOW), "shadow"); + BOOST_CHECK_EQUAL (dcp::dc::effect_to_string (dcp::dc::NONE), "none"); + BOOST_CHECK_EQUAL (dcp::dc::effect_to_string (dcp::dc::BORDER), "border"); + BOOST_CHECK_EQUAL (dcp::dc::effect_to_string (dcp::dc::SHADOW), "shadow"); - BOOST_CHECK_THROW (dcp::effect_to_string ((dcp::Effect) 42), dcp::MiscError); + BOOST_CHECK_THROW (dcp::dc::effect_to_string ((dcp::dc::Effect) 42), dcp::dc::MiscError); - BOOST_CHECK_EQUAL (dcp::string_to_effect ("none"), dcp::NONE); - BOOST_CHECK_EQUAL (dcp::string_to_effect ("border"), dcp::BORDER); - BOOST_CHECK_EQUAL (dcp::string_to_effect ("shadow"), dcp::SHADOW); - BOOST_CHECK_THROW (dcp::string_to_effect ("fish"), dcp::DCPReadError); + BOOST_CHECK_EQUAL (dcp::dc::string_to_effect ("none"), dcp::dc::NONE); + BOOST_CHECK_EQUAL (dcp::dc::string_to_effect ("border"), dcp::dc::BORDER); + BOOST_CHECK_EQUAL (dcp::dc::string_to_effect ("shadow"), dcp::dc::SHADOW); + BOOST_CHECK_THROW (dcp::dc::string_to_effect ("fish"), dcp::dc::DCPReadError); } diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 7c8256fa..045d22be 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -52,46 +52,46 @@ BOOST_AUTO_TEST_CASE (encryption_test) Kumu::libdcp_test = true; - dcp::MXFMetadata mxf_metadata; + dcp::dc::MXFMetadata mxf_metadata; mxf_metadata.company_name = "OpenDCP"; mxf_metadata.product_name = "OpenDCP"; mxf_metadata.product_version = "0.0.25"; - dcp::XMLMetadata xml_metadata; + dcp::dc::XMLMetadata xml_metadata; xml_metadata.issuer = "OpenDCP 0.0.25"; xml_metadata.creator = "OpenDCP 0.0.25"; xml_metadata.issue_date = "2012-07-17T04:45:18+00:00"; boost::filesystem::remove_all ("build/test/DCP/encryption_test"); boost::filesystem::create_directories ("build/test/DCP/encryption_test"); - dcp::DCP d ("build/test/DCP/encryption_test"); + dcp::dc::Package d ("build/test/DCP/encryption_test"); /* Use test/ref/crypt so this test is repeatable */ - shared_ptr<dcp::CertificateChain> signer (new dcp::CertificateChain ()); - signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - signer->set_key (dcp::file_to_string ("test/ref/crypt/leaf.key")); + shared_ptr<dcp::dc::CertificateChain> signer (new dcp::dc::CertificateChain ()); + signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + signer->set_key (dcp::dc::file_to_string ("test/ref/crypt/leaf.key")); - shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE)); - dcp::Key key; + dcp::dc::Key key; - shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr<dcp::dc::MonoPictureAsset> mp (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); mp->set_metadata (mxf_metadata); mp->set_key (key); - shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", dcp::SMPTE, false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + shared_ptr<dcp::dc::PictureAssetWriter> writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", dcp::dc::SMPTE, false); + dcp::dc::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { writer->write (j2c.data (), j2c.size ()); } writer->finalize (); - shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1)); + shared_ptr<dcp::dc::SoundAsset> ms (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 1)); ms->set_metadata (mxf_metadata); ms->set_key (key); - shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::SMPTE); + shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::dc::SMPTE); SF_INFO info; info.format = 0; @@ -110,10 +110,10 @@ BOOST_AUTO_TEST_CASE (encryption_test) sound_writer->finalize (); - cpl->add (shared_ptr<dcp::Reel> (new dcp::Reel ( - shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr<dcp::ReelSubtitleAsset> () + cpl->add (shared_ptr<dcp::dc::Reel> (new dcp::dc::Reel ( + shared_ptr<dcp::dc::ReelMonoPictureAsset> (new dcp::dc::ReelMonoPictureAsset (mp, 0)), + shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (ms, 0)), + shared_ptr<dcp::dc::ReelSubtitleAsset> () ))); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); @@ -121,19 +121,19 @@ BOOST_AUTO_TEST_CASE (encryption_test) d.add (cpl); - d.write_xml (dcp::SMPTE, xml_metadata, signer); + d.write_xml (dcp::dc::SMPTE, xml_metadata, signer); - dcp::DecryptedKDM kdm ( + dcp::dc::DecryptedKDM kdm ( cpl, key, - dcp::LocalTime ("2013-01-01T00:00:00+00:00"), - dcp::LocalTime ("2017-01-08T00:00:00+00:00"), + dcp::dc::LocalTime ("2013-01-01T00:00:00+00:00"), + dcp::dc::LocalTime ("2017-01-08T00:00:00+00:00"), "libdcp", "test", "2012-07-17T04:45:18+00:00" ); - kdm.encrypt (signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml"); + kdm.encrypt (signer, signer->leaf(), vector<dcp::dc::Certificate>(), dcp::dc::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml"); int r = system ( "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml " diff --git a/test/exception_test.cc b/test/exception_test.cc index dd9608ee..da7ba5ba 100644 --- a/test/exception_test.cc +++ b/test/exception_test.cc @@ -25,11 +25,11 @@ using std::string; /** Test exception classes */ BOOST_AUTO_TEST_CASE (exception_test) { - BOOST_CHECK_EQUAL (string (dcp::FileError ("foo", "bar", 42).what()), "foo (bar) (error 42)"); - BOOST_CHECK_EQUAL (string (dcp::UnresolvedRefError ("foo").what()), "Unresolved reference to asset id foo"); - BOOST_CHECK_EQUAL (string (dcp::NotEncryptedError ("foo").what()), "foo is not encrypted"); - BOOST_CHECK_EQUAL (string (dcp::ProgrammingError ("foo", 42).what()), "Programming error at foo:42"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_PICTURE).what()), "Missing asset foo for main picture"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_SOUND).what()), "Missing asset foo for main sound"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_SUBTITLE).what()), "Missing asset foo for main subtitle"); + BOOST_CHECK_EQUAL (string (dcp::dc::FileError ("foo", "bar", 42).what()), "foo (bar) (error 42)"); + BOOST_CHECK_EQUAL (string (dcp::dc::UnresolvedRefError ("foo").what()), "Unresolved reference to asset id foo"); + BOOST_CHECK_EQUAL (string (dcp::dc::NotEncryptedError ("foo").what()), "foo is not encrypted"); + BOOST_CHECK_EQUAL (string (dcp::dc::ProgrammingError ("foo", 42).what()), "Programming error at foo:42"); + BOOST_CHECK_EQUAL (string (dcp::dc::MissingAssetError ("foo", dcp::dc::MissingAssetError::MAIN_PICTURE).what()), "Missing asset foo for main picture"); + BOOST_CHECK_EQUAL (string (dcp::dc::MissingAssetError ("foo", dcp::dc::MissingAssetError::MAIN_SOUND).what()), "Missing asset foo for main sound"); + BOOST_CHECK_EQUAL (string (dcp::dc::MissingAssetError ("foo", dcp::dc::MissingAssetError::MAIN_SUBTITLE).what()), "Missing asset foo for main subtitle"); } diff --git a/test/fraction_test.cc b/test/fraction_test.cc index efdba664..71819995 100644 --- a/test/fraction_test.cc +++ b/test/fraction_test.cc @@ -24,15 +24,15 @@ /** Test dcp::Fraction */ BOOST_AUTO_TEST_CASE (fraction_test) { - dcp::Fraction f (42, 26); - dcp::Fraction g (42, 26); - dcp::Fraction h (43, 26); - dcp::Fraction i (42, 27); + dcp::dc::Fraction f (42, 26); + dcp::dc::Fraction g (42, 26); + dcp::dc::Fraction h (43, 26); + dcp::dc::Fraction i (42, 27); BOOST_CHECK (f == g); BOOST_CHECK (g != h); BOOST_CHECK (g != i); - BOOST_CHECK_THROW (dcp::Fraction ("1 2 3"), dcp::XMLError); + BOOST_CHECK_THROW (dcp::dc::Fraction ("1 2 3"), dcp::dc::XMLError); } diff --git a/test/gamma_transfer_function_test.cc b/test/gamma_transfer_function_test.cc index 9e0ea089..383b00f5 100644 --- a/test/gamma_transfer_function_test.cc +++ b/test/gamma_transfer_function_test.cc @@ -26,15 +26,15 @@ using boost::shared_ptr; /** Check GammaTransferFunction::about_equal */ BOOST_AUTO_TEST_CASE (gamma_transfer_function_test) { - shared_ptr<dcp::GammaTransferFunction> a (new dcp::GammaTransferFunction (1.2)); - shared_ptr<dcp::GammaTransferFunction> b (new dcp::GammaTransferFunction (1.2)); + shared_ptr<dcp::dc::GammaTransferFunction> a (new dcp::dc::GammaTransferFunction (1.2)); + shared_ptr<dcp::dc::GammaTransferFunction> b (new dcp::dc::GammaTransferFunction (1.2)); BOOST_CHECK (a->about_equal (b, 1e-6)); - a.reset (new dcp::GammaTransferFunction (1.2)); - a.reset (new dcp::GammaTransferFunction (1.3)); + a.reset (new dcp::dc::GammaTransferFunction (1.2)); + a.reset (new dcp::dc::GammaTransferFunction (1.3)); BOOST_CHECK (a->about_equal (b, 0.2)); BOOST_CHECK (!a->about_equal (b, 0.05)); - shared_ptr<dcp::ModifiedGammaTransferFunction> c (new dcp::ModifiedGammaTransferFunction (2.4, 0.05, 1, 2)); + shared_ptr<dcp::dc::ModifiedGammaTransferFunction> c (new dcp::dc::ModifiedGammaTransferFunction (2.4, 0.05, 1, 2)); BOOST_CHECK (!a->about_equal (c, 1)); } diff --git a/test/interop_load_font_test.cc b/test/interop_load_font_test.cc index 04520080..34c51c00 100644 --- a/test/interop_load_font_test.cc +++ b/test/interop_load_font_test.cc @@ -25,7 +25,7 @@ /** Test dcp::InteropLoadFont's simple constructor */ BOOST_AUTO_TEST_CASE (interop_load_font_test1) { - dcp::InteropLoadFontNode lf ("my-great-id", "my-great-uri"); + dcp::dc::InteropLoadFontNode lf ("my-great-id", "my-great-uri"); BOOST_CHECK_EQUAL (lf.id, "my-great-id"); BOOST_CHECK_EQUAL (lf.uri, "my-great-uri"); } @@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test2) text->set_attribute("Id", "my-great-id"); text->set_attribute("URI", "my-great-uri"); - dcp::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); + dcp::dc::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); BOOST_CHECK_EQUAL (lf.id, "my-great-id"); } @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test3) text->set_attribute("ID", "my-great-id"); text->set_attribute("URI", "my-great-uri"); - dcp::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); + dcp::dc::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); BOOST_CHECK_EQUAL (lf.id, "my-great-id"); } @@ -59,9 +59,9 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test3) /** Test operator== and operator!= */ BOOST_AUTO_TEST_CASE (interop_load_font_test4) { - dcp::InteropLoadFontNode A ("my-create-id", "my-great-uri"); - dcp::InteropLoadFontNode B ("my-create-id", "my-great-uri"); - dcp::InteropLoadFontNode C ("my-create-id", "another-great-uri"); + dcp::dc::InteropLoadFontNode A ("my-create-id", "my-great-uri"); + dcp::dc::InteropLoadFontNode B ("my-create-id", "my-great-uri"); + dcp::dc::InteropLoadFontNode C ("my-create-id", "another-great-uri"); BOOST_CHECK (A == B); BOOST_CHECK (B != C); diff --git a/test/kdm_test.cc b/test/kdm_test.cc index d6d4a2b6..754c28ce 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -30,14 +30,14 @@ using boost::shared_ptr; /** Check reading and decryption of a KDM */ BOOST_AUTO_TEST_CASE (kdm_test) { - dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ( - dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") + dcp::dc::DecryptedKDM kdm ( + dcp::dc::EncryptedKDM ( + dcp::dc::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") ), - dcp::file_to_string ("test/data/private.key") + dcp::dc::file_to_string ("test/data/private.key") ); - list<dcp::DecryptedKDMKey> keys = kdm.keys (); + list<dcp::dc::DecryptedKDMKey> keys = kdm.keys (); BOOST_CHECK_EQUAL (keys.size(), 2); @@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE (kdm_test) /** Check that we can read in a KDM and then write it back out again the same */ BOOST_AUTO_TEST_CASE (kdm_passthrough_test) { - dcp::EncryptedKDM kdm ( - dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") + dcp::dc::EncryptedKDM kdm ( + dcp::dc::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") ); shared_ptr<xmlpp::DomParser> parser (new xmlpp::DomParser ()); diff --git a/test/local_time_test.cc b/test/local_time_test.cc index 4cd79158..d9f951df 100644 --- a/test/local_time_test.cc +++ b/test/local_time_test.cc @@ -25,17 +25,17 @@ BOOST_AUTO_TEST_CASE (local_time_test) { /* Badly-formatted times */ - BOOST_CHECK_THROW (dcp::LocalTime (""), dcp::TimeFormatError); - BOOST_CHECK_THROW (dcp::LocalTime ("XXX"), dcp::TimeFormatError); - BOOST_CHECK_THROW (dcp::LocalTime ("2013-01-05T18:06:59+04:0"), dcp::TimeFormatError); - BOOST_CHECK_THROW (dcp::LocalTime ("2013-01-05T18:06:59X04:00"), dcp::TimeFormatError); - BOOST_CHECK_THROW (dcp::LocalTime ("2013-01-05T18-06:59+04:00"), dcp::TimeFormatError); - BOOST_CHECK_THROW (dcp::LocalTime ("2013!01-05T18:06:59+04:00"), dcp::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime (""), dcp::dc::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime ("XXX"), dcp::dc::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime ("2013-01-05T18:06:59+04:0"), dcp::dc::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime ("2013-01-05T18:06:59X04:00"), dcp::dc::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime ("2013-01-05T18-06:59+04:00"), dcp::dc::TimeFormatError); + BOOST_CHECK_THROW (dcp::dc::LocalTime ("2013!01-05T18:06:59+04:00"), dcp::dc::TimeFormatError); /* Correctly-formatted */ { - dcp::LocalTime t ("2013-01-05T18:06:59+04:00"); + dcp::dc::LocalTime t ("2013-01-05T18:06:59+04:00"); BOOST_CHECK_EQUAL (t._year, 2013); BOOST_CHECK_EQUAL (t._month, 1); BOOST_CHECK_EQUAL (t._day, 5); @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (local_time_test) } { - dcp::LocalTime t ("2011-11-20T01:06:59-09:30"); + dcp::dc::LocalTime t ("2011-11-20T01:06:59-09:30"); BOOST_CHECK_EQUAL (t._year, 2011); BOOST_CHECK_EQUAL (t._month, 11); BOOST_CHECK_EQUAL (t._day, 20); @@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (local_time_test) } { - dcp::LocalTime t ("2011-11-20T01:06:59.456-09:30"); + dcp::dc::LocalTime t ("2011-11-20T01:06:59.456-09:30"); BOOST_CHECK_EQUAL (t._year, 2011); BOOST_CHECK_EQUAL (t._month, 11); BOOST_CHECK_EQUAL (t._day, 20); @@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (local_time_test) { /* Construction from boost::posix_time::ptime */ - dcp::LocalTime b (boost::posix_time::time_from_string ("2002-01-20 19:03:56")); + dcp::dc::LocalTime b (boost::posix_time::time_from_string ("2002-01-20 19:03:56")); BOOST_CHECK_EQUAL (b._year, 2002); BOOST_CHECK_EQUAL (b._month, 1); BOOST_CHECK_EQUAL (b._day, 20); @@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (local_time_test) { /* Construction from boost::posix_time::ptime with milliseconds */ - dcp::LocalTime b (boost::posix_time::time_from_string ("2002-01-20 19:03:56.491")); + dcp::dc::LocalTime b (boost::posix_time::time_from_string ("2002-01-20 19:03:56.491")); BOOST_CHECK_EQUAL (b._year, 2002); BOOST_CHECK_EQUAL (b._month, 1); BOOST_CHECK_EQUAL (b._day, 20); diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc index 097d0aa9..b28d112b 100644 --- a/test/read_dcp_test.cc +++ b/test/read_dcp_test.cc @@ -27,12 +27,12 @@ using boost::shared_ptr; /** Read DCP that is in git and make sure that basic stuff is read in correctly */ BOOST_AUTO_TEST_CASE (read_dcp) { - dcp::DCP d ("test/ref/DCP/dcp_test1"); + dcp::dc::Package d ("test/ref/DCP/dcp_test1"); d.read (); - list<shared_ptr<dcp::CPL> > cpls = d.cpls (); + list<shared_ptr<dcp::dc::CPL> > cpls = d.cpls (); BOOST_CHECK_EQUAL (cpls.size(), 1); BOOST_CHECK_EQUAL (cpls.front()->annotation_text(), "A Test DCP"); - BOOST_CHECK_EQUAL (cpls.front()->content_kind(), dcp::FEATURE); + BOOST_CHECK_EQUAL (cpls.front()->content_kind(), dcp::dc::FEATURE); } diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc index a66327f1..5c1c38a6 100644 --- a/test/read_interop_subtitle_test.cc +++ b/test/read_interop_subtitle_test.cc @@ -30,476 +30,476 @@ using boost::dynamic_pointer_cast; /** Load some subtitle content from Interop XML and check that it is read correctly */ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1) { - dcp::InteropSubtitleAsset subs ("test/data/subs1.xml"); + dcp::dc::InteropSubtitleAsset subs ("test/data/subs1.xml"); BOOST_CHECK_EQUAL (subs.id(), "cab5c268-222b-41d2-88ae-6d6999441b17"); BOOST_CHECK_EQUAL (subs.movie_title(), "Movie Title"); BOOST_CHECK_EQUAL (subs.reel_number(), "1"); BOOST_CHECK_EQUAL (subs.language(), "French"); - list<shared_ptr<dcp::LoadFontNode> > lfn = subs.load_font_nodes (); + list<shared_ptr<dcp::dc::LoadFontNode> > lfn = subs.load_font_nodes (); BOOST_REQUIRE_EQUAL (lfn.size(), 1); - shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ()); + shared_ptr<dcp::dc::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::dc::InteropLoadFontNode> (lfn.front ()); BOOST_REQUIRE (interop_lfn); BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId"); BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf"); - list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false); + list<dcp::dc::SubtitleString> s = subs.subtitles_during (dcp::dc::Time (0, 0, 6, 1, 250), dcp::dc::Time (0, 0, 6, 2, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 1); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFontId"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 39, 1.0, - dcp::Time (0, 0, 5, 198, 250), - dcp::Time (0, 0, 7, 115, 250), + dcp::dc::Time (0, 0, 5, 198, 250), + dcp::dc::Time (0, 0, 7, 115, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.15, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "My jacket was Idi Amin's", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 1, 250), - dcp::Time (0, 0, 0, 1, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 1, 250), + dcp::dc::Time (0, 0, 0, 1, 250) )); - s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 0, 7, 190, 250), dcp::dc::Time (0, 0, 7, 191, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFontId"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 39, 1.0, - dcp::Time (0, 0, 7, 177, 250), - dcp::Time (0, 0, 11, 31, 250), + dcp::dc::Time (0, 0, 7, 177, 250), + dcp::dc::Time (0, 0, 11, 31, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.21, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "My corset was H.M. The Queen's", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 1, 250), - dcp::Time (0, 0, 0, 1, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 1, 250), + dcp::dc::Time (0, 0, 0, 1, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFontId"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 39, 1.0, - dcp::Time (0, 0, 7, 177, 250), - dcp::Time (0, 0, 11, 31, 250), + dcp::dc::Time (0, 0, 7, 177, 250), + dcp::dc::Time (0, 0, 11, 31, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.15, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "My large wonderbra", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 1, 250), - dcp::Time (0, 0, 0, 1, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 1, 250), + dcp::dc::Time (0, 0, 0, 1, 250) )); - s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 0, 11, 95, 250), dcp::dc::Time (0, 0, 11, 96, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 1); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFontId"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 39, 1.0, - dcp::Time (0, 0, 11, 94, 250), - dcp::Time (0, 0, 13, 63, 250), + dcp::dc::Time (0, 0, 11, 94, 250), + dcp::dc::Time (0, 0, 13, 63, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.15, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "Once belonged to the Shah", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 1, 250), - dcp::Time (0, 0, 0, 1, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 1, 250), + dcp::dc::Time (0, 0, 0, 1, 250) )); - s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 0, 14, 42, 250), dcp::dc::Time (0, 0, 14, 43, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 1); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFontId"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 39, 1.0, - dcp::Time (0, 0, 13, 104, 250), - dcp::Time (0, 0, 15, 177, 250), + dcp::dc::Time (0, 0, 13, 104, 250), + dcp::dc::Time (0, 0, 15, 177, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.15, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "And these are Roy Hattersley's jeans", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 1, 250), - dcp::Time (0, 0, 0, 1, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 1, 250), + dcp::dc::Time (0, 0, 0, 1, 250) )); } /** And similarly for another one */ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2) { - dcp::InteropSubtitleAsset subs ("test/data/subs2.xml"); + dcp::dc::InteropSubtitleAsset subs ("test/data/subs2.xml"); - list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false); + list<dcp::dc::SubtitleString> s = subs.subtitles_during (dcp::dc::Time (0, 0, 42, 100, 250), dcp::dc::Time (0, 0, 42, 101, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 0, 41, 62, 250), - dcp::Time (0, 0, 43, 52, 250), + dcp::dc::Time (0, 0, 41, 62, 250), + dcp::dc::Time (0, 0, 43, 52, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "At afternoon tea with John Peel", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 0, 41, 62, 250), - dcp::Time (0, 0, 43, 52, 250), + dcp::dc::Time (0, 0, 41, 62, 250), + dcp::dc::Time (0, 0, 43, 52, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "I enquired if his accent was real", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 0, 50, 50, 250), dcp::dc::Time (0, 0, 50, 51, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 0, 50, 42, 250), - dcp::Time (0, 0, 52, 21, 250), + dcp::dc::Time (0, 0, 50, 42, 250), + dcp::dc::Time (0, 0, 52, 21, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "He said \"out of the house", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 0, 50, 42, 250), - dcp::Time (0, 0, 52, 21, 250), + dcp::dc::Time (0, 0, 50, 42, 250), + dcp::dc::Time (0, 0, 52, 21, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "I'm incredibly scouse", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 2, 300, 250), dcp::dc::Time (0, 1, 2, 301, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 2, 208, 250), - dcp::Time (0, 1, 4, 10, 250), + dcp::dc::Time (0, 1, 2, 208, 250), + dcp::dc::Time (0, 1, 4, 10, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "At home it depends how I feel.\"", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 2, 208, 250), - dcp::Time (0, 1, 4, 10, 250), + dcp::dc::Time (0, 1, 2, 208, 250), + dcp::dc::Time (0, 1, 4, 10, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "I spent a long weekend in Brighton", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 15, 50, 250), dcp::dc::Time (0, 1, 15, 51, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 15, 42, 250), - dcp::Time (0, 1, 16, 42, 250), + dcp::dc::Time (0, 1, 15, 42, 250), + dcp::dc::Time (0, 1, 16, 42, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "With the legendary Miss Enid Blyton", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 15, 42, 250), - dcp::Time (0, 1, 16, 42, 250), + dcp::dc::Time (0, 1, 15, 42, 250), + dcp::dc::Time (0, 1, 16, 42, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "She said \"you be Noddy", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 27, 200, 250), dcp::dc::Time (0, 1, 27, 201, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 27, 115, 250), - dcp::Time (0, 1, 28, 208, 250), + dcp::dc::Time (0, 1, 27, 115, 250), + dcp::dc::Time (0, 1, 28, 208, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "That curious creature the Sphinx", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 27, 115, 250), - dcp::Time (0, 1, 28, 208, 250), + dcp::dc::Time (0, 1, 27, 115, 250), + dcp::dc::Time (0, 1, 28, 208, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "Is smarter than anyone thinks", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 42, 300, 250), dcp::dc::Time (0, 1, 42, 301, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 42, 229, 250), - dcp::Time (0, 1, 45, 62, 250), + dcp::dc::Time (0, 1, 42, 229, 250), + dcp::dc::Time (0, 1, 45, 62, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "It sits there and smirks", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 42, 229, 250), - dcp::Time (0, 1, 45, 62, 250), + dcp::dc::Time (0, 1, 42, 229, 250), + dcp::dc::Time (0, 1, 45, 62, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "And you don't think it works", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 45, 200, 250), dcp::dc::Time (0, 1, 45, 201, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 45, 146, 250), - dcp::Time (0, 1, 47, 94, 250), + dcp::dc::Time (0, 1, 45, 146, 250), + dcp::dc::Time (0, 1, 47, 94, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "Then when you're not looking, it winks.", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 45, 146, 250), - dcp::Time (0, 1, 47, 94, 250), + dcp::dc::Time (0, 1, 45, 146, 250), + dcp::dc::Time (0, 1, 47, 94, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "When it snows you will find Sister Sledge", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 1, 47, 249, 250), dcp::dc::Time (0, 1, 47, 250, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 47, 146, 250), - dcp::Time (0, 1, 48, 167, 250), + dcp::dc::Time (0, 1, 47, 146, 250), + dcp::dc::Time (0, 1, 48, 167, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "Out mooning, at night, on the ledge", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 1, 47, 146, 250), - dcp::Time (0, 1, 48, 167, 250), + dcp::dc::Time (0, 1, 47, 146, 250), + dcp::dc::Time (0, 1, 48, 167, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "One storey down", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false); + s = subs.subtitles_during (dcp::dc::Time (0, 2, 6, 210, 250), dcp::dc::Time (0, 2, 6, 211, 250), false); BOOST_REQUIRE_EQUAL (s.size(), 2); - BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.front(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 2, 5, 208, 250), - dcp::Time (0, 2, 7, 31, 250), + dcp::dc::Time (0, 2, 5, 208, 250), + dcp::dc::Time (0, 2, 7, 31, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.89, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "HELLO", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); - BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString ( + BOOST_CHECK_EQUAL (s.back(), dcp::dc::SubtitleString ( string ("theFont"), true, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 42, 1.0, - dcp::Time (0, 2, 5, 208, 250), - dcp::Time (0, 2, 7, 31, 250), + dcp::dc::Time (0, 2, 5, 208, 250), + dcp::dc::Time (0, 2, 7, 31, 250), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.95, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "WORLD", - dcp::BORDER, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 250), - dcp::Time (0, 0, 0, 0, 250) + dcp::dc::BORDER, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 250), + dcp::dc::Time (0, 0, 0, 0, 250) )); } diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc index f4d28106..15a558d8 100644 --- a/test/read_smpte_subtitle_test.cc +++ b/test/read_smpte_subtitle_test.cc @@ -32,7 +32,7 @@ using boost::dynamic_pointer_cast; /** Check reading of a SMPTE subtitle file */ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test) { - dcp::SMPTESubtitleAsset sc ( + dcp::dc::SMPTESubtitleAsset sc ( private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV" / @@ -43,25 +43,25 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test) BOOST_CHECK_EQUAL (sc.content_title_text(), "Journey to Jah"); BOOST_REQUIRE (sc.annotation_text()); BOOST_CHECK_EQUAL (sc.annotation_text().get(), "Journey to Jah"); - BOOST_CHECK_EQUAL (sc.issue_date(), dcp::LocalTime ("2014-02-25T11:22:48.000-00:00")); + BOOST_CHECK_EQUAL (sc.issue_date(), dcp::dc::LocalTime ("2014-02-25T11:22:48.000-00:00")); BOOST_REQUIRE (sc.reel_number()); BOOST_CHECK_EQUAL (sc.reel_number().get(), 1); BOOST_REQUIRE (sc.language ()); BOOST_CHECK_EQUAL (sc.language().get (), "de"); - BOOST_CHECK_EQUAL (sc.edit_rate(), dcp::Fraction (25, 1)); + BOOST_CHECK_EQUAL (sc.edit_rate(), dcp::dc::Fraction (25, 1)); BOOST_CHECK_EQUAL (sc.time_code_rate(), 25); - BOOST_CHECK_EQUAL (sc.start_time(), dcp::Time (0, 0, 0, 0, 25)); - list<shared_ptr<dcp::LoadFontNode> > lfn = sc.load_font_nodes (); + BOOST_CHECK_EQUAL (sc.start_time(), dcp::dc::Time (0, 0, 0, 0, 25)); + list<shared_ptr<dcp::dc::LoadFontNode> > lfn = sc.load_font_nodes (); BOOST_REQUIRE_EQUAL (lfn.size(), 1); - shared_ptr<dcp::SMPTELoadFontNode> smpte_lfn = dynamic_pointer_cast<dcp::SMPTELoadFontNode> (lfn.front ()); + shared_ptr<dcp::dc::SMPTELoadFontNode> smpte_lfn = dynamic_pointer_cast<dcp::dc::SMPTELoadFontNode> (lfn.front ()); BOOST_REQUIRE (smpte_lfn); BOOST_CHECK_EQUAL (smpte_lfn->id, "theFontId"); BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea"); BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63); BOOST_CHECK_EQUAL (sc.subtitles().front().text(), "Noch mal."); - BOOST_CHECK_EQUAL (sc.subtitles().front().in(), dcp::Time (0, 0, 25, 12, 25)); - BOOST_CHECK_EQUAL (sc.subtitles().front().out(), dcp::Time (0, 0, 26, 4, 25)); + BOOST_CHECK_EQUAL (sc.subtitles().front().in(), dcp::dc::Time (0, 0, 25, 12, 25)); + BOOST_CHECK_EQUAL (sc.subtitles().front().out(), dcp::dc::Time (0, 0, 26, 4, 25)); BOOST_CHECK_EQUAL (sc.subtitles().back().text(), "Prochainement"); - BOOST_CHECK_EQUAL (sc.subtitles().back().in(), dcp::Time (0, 1, 57, 17, 25)); - BOOST_CHECK_EQUAL (sc.subtitles().back().out(), dcp::Time (0, 1, 58, 12, 25)); + BOOST_CHECK_EQUAL (sc.subtitles().back().in(), dcp::dc::Time (0, 1, 57, 17, 25)); + BOOST_CHECK_EQUAL (sc.subtitles().back().out(), dcp::dc::Time (0, 1, 58, 12, 25)); } diff --git a/test/recovery_test.cc b/test/recovery_test.cc index cd7d3d92..d18a4b2b 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -48,12 +48,12 @@ BOOST_AUTO_TEST_CASE (recovery) boost::filesystem::remove_all ("build/test/baz"); boost::filesystem::create_directories ("build/test/baz"); - shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); - shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::SMPTE, false); + shared_ptr<dcp::dc::MonoPictureAsset> mp (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); + shared_ptr<dcp::dc::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::dc::SMPTE, false); int written_size = 0; for (int i = 0; i < 24; ++i) { - dcp::FrameInfo info = writer->write (data, size); + dcp::dc::FrameInfo info = writer->write (data, size); written_size = info.size; } @@ -76,8 +76,8 @@ BOOST_AUTO_TEST_CASE (recovery) Kumu::ResetTestRNG (); #endif - mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); - writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true); + mp.reset (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); + writer = mp->start_write ("build/test/baz/video2.mxf", dcp::dc::SMPTE, true); writer->write (data, size); diff --git a/test/reel_asset_test.cc b/test/reel_asset_test.cc index bdbd68ea..e33e6fdf 100644 --- a/test/reel_asset_test.cc +++ b/test/reel_asset_test.cc @@ -42,6 +42,6 @@ BOOST_AUTO_TEST_CASE (reel_picture_asset_test) "</MainPicture>" ); - dcp::ReelMonoPictureAsset pa (doc); - BOOST_CHECK_EQUAL (pa.screen_aspect_ratio(), dcp::Fraction (2048, 858)); + dcp::dc::ReelMonoPictureAsset pa (doc); + BOOST_CHECK_EQUAL (pa.screen_aspect_ratio(), dcp::dc::Fraction (2048, 858)); } diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index f3165601..f14a7231 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -30,7 +30,7 @@ using std::cerr; using std::list; using std::string; using boost::shared_ptr; -using namespace dcp; +using namespace dcp::dc; /** Load a DCP then re-write its subtitle XML or MXF in-place */ int @@ -42,7 +42,7 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - DCP* dcp = new DCP (argv[1]); + Package* dcp = new Package (argv[1]); dcp->read (true); list<shared_ptr<CPL> > cpls = dcp->cpls (); diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc index 8f5698fe..40ed63b7 100644 --- a/test/rgb_xyz_test.cc +++ b/test/rgb_xyz_test.cc @@ -36,7 +36,7 @@ using boost::scoped_array; BOOST_AUTO_TEST_CASE (rgb_xyz_test) { srand (0); - dcp::Size const size (640, 480); + dcp::dc::Size const size (640, 480); scoped_array<uint8_t> rgb (new uint8_t[size.width * size.height * 6]); for (int y = 0; y < size.height; ++y) { @@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test) } } - shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ()); + shared_ptr<dcp::dc::OpenJPEGImage> xyz = dcp::dc::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::dc::ColourConversion::srgb_to_xyz ()); for (int y = 0; y < size.height; ++y) { uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6); @@ -108,16 +108,16 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test) static list<string> notes; static void -note_handler (dcp::NoteType n, string s) +note_handler (dcp::dc::NoteType n, string s) { - BOOST_REQUIRE_EQUAL (n, dcp::DCP_NOTE); + BOOST_REQUIRE_EQUAL (n, dcp::dc::DCP_NOTE); notes.push_back (s); } /** Check that xyz_to_rgb clamps XYZ values correctly */ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test) { - shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (2, 2))); + shared_ptr<dcp::dc::OpenJPEGImage> xyz (new dcp::dc::OpenJPEGImage (dcp::dc::Size (2, 2))); xyz->data(0)[0] = -4; xyz->data(0)[1] = 6901; @@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test) scoped_array<uint8_t> rgb (new uint8_t[2 * 2 * 6]); notes.clear (); - dcp::xyz_to_rgb ( - xyz, dcp::ColourConversion::srgb_to_xyz (), rgb.get(), 2 * 6, boost::optional<dcp::NoteHandler> (boost::bind (¬e_handler, _1, _2)) + dcp::dc::xyz_to_rgb ( + xyz, dcp::dc::ColourConversion::srgb_to_xyz (), rgb.get(), 2 * 6, boost::optional<dcp::dc::NoteHandler> (boost::bind (¬e_handler, _1, _2)) ); /* The 6 out-of-range samples should have been noted */ @@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test) BOOST_AUTO_TEST_CASE (rgb_xyz_round_trip_test) { srand (0); - dcp::Size const size (640, 480); + dcp::dc::Size const size (640, 480); scoped_array<uint8_t> rgb (new uint8_t[size.width * size.height * 6]); for (int y = 0; y < size.height; ++y) { @@ -181,9 +181,9 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_round_trip_test) } } - shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ()); + shared_ptr<dcp::dc::OpenJPEGImage> xyz = dcp::dc::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::dc::ColourConversion::srgb_to_xyz ()); scoped_array<uint8_t> back (new uint8_t[size.width * size.height * 6]); - dcp::xyz_to_rgb (xyz, dcp::ColourConversion::srgb_to_xyz (), back.get(), size.width * 6); + dcp::dc::xyz_to_rgb (xyz, dcp::dc::ColourConversion::srgb_to_xyz (), back.get(), size.width * 6); #if 0 uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get ()); diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 45b2cbad..05e46b2e 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -47,34 +47,34 @@ using boost::scoped_array; /** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */ BOOST_AUTO_TEST_CASE (round_trip_test) { - shared_ptr<dcp::CertificateChain> signer (new dcp::CertificateChain ("openssl")); + shared_ptr<dcp::dc::CertificateChain> signer (new dcp::dc::CertificateChain ("openssl")); boost::filesystem::path work_dir = "build/test/round_trip_test"; boost::filesystem::create_directory (work_dir); - shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); - shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", dcp::SMPTE, false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + shared_ptr<dcp::dc::MonoPictureAsset> asset_A (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1))); + shared_ptr<dcp::dc::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", dcp::dc::SMPTE, false); + dcp::dc::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { writer->write (j2c.data (), j2c.size ()); } writer->finalize (); - dcp::Key key; + dcp::dc::Key key; asset_A->set_key (key); - shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); - shared_ptr<dcp::Reel> reel (new dcp::Reel ()); - reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (asset_A, 0))); + shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE)); + shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ()); + reel->add (shared_ptr<dcp::dc::ReelMonoPictureAsset> (new dcp::dc::ReelMonoPictureAsset (asset_A, 0))); cpl->add (reel); /* A KDM using our certificate chain's leaf key pair */ - dcp::DecryptedKDM kdm_A ( + dcp::dc::DecryptedKDM kdm_A ( cpl, key, - dcp::LocalTime ("2013-01-01T00:00:00+00:00"), - dcp::LocalTime ("2013-01-08T00:00:00+00:00"), + dcp::dc::LocalTime ("2013-01-01T00:00:00+00:00"), + dcp::dc::LocalTime ("2013-01-08T00:00:00+00:00"), "libdcp", "test", "2012-07-17T04:45:18+00:00" @@ -82,17 +82,17 @@ BOOST_AUTO_TEST_CASE (round_trip_test) boost::filesystem::path const kdm_file = work_dir / "kdm.xml"; - kdm_A.encrypt(signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file); + kdm_A.encrypt(signer, signer->leaf(), vector<dcp::dc::Certificate>(), dcp::dc::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file); /* Reload the KDM, using our private key to decrypt it */ - dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ()); + dcp::dc::DecryptedKDM kdm_B (dcp::dc::EncryptedKDM (dcp::dc::file_to_string (kdm_file)), signer->key().get ()); /* Check that the decrypted KDMKeys are the same as the ones we started with */ BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size()); - list<dcp::DecryptedKDMKey> keys_A = kdm_A.keys (); - list<dcp::DecryptedKDMKey> keys_B = kdm_B.keys (); - list<dcp::DecryptedKDMKey>::const_iterator i = keys_A.begin(); - list<dcp::DecryptedKDMKey>::const_iterator j = keys_B.begin(); + list<dcp::dc::DecryptedKDMKey> keys_A = kdm_A.keys (); + list<dcp::dc::DecryptedKDMKey> keys_B = kdm_B.keys (); + list<dcp::dc::DecryptedKDMKey>::const_iterator i = keys_A.begin(); + list<dcp::dc::DecryptedKDMKey>::const_iterator j = keys_B.begin(); while (i != keys_A.end ()) { BOOST_CHECK (*i == *j); ++i; @@ -100,21 +100,21 @@ BOOST_AUTO_TEST_CASE (round_trip_test) } /* Reload the picture asset */ - shared_ptr<dcp::MonoPictureAsset> asset_B ( - new dcp::MonoPictureAsset (work_dir / "video.mxf") + shared_ptr<dcp::dc::MonoPictureAsset> asset_B ( + new dcp::dc::MonoPictureAsset (work_dir / "video.mxf") ); BOOST_CHECK (!kdm_B.keys().empty ()); asset_B->set_key (kdm_B.keys().front().key()); - shared_ptr<dcp::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image (); - shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image (); + shared_ptr<dcp::dc::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image (); + shared_ptr<dcp::dc::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image (); scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]); - dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get()); + dcp::dc::xyz_to_rgba (xyz_A, dcp::dc::ColourConversion::srgb_to_xyz(), frame_A.get()); scoped_array<uint8_t> frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]); - dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get()); + dcp::dc::xyz_to_rgba (xyz_B, dcp::dc::ColourConversion::srgb_to_xyz(), frame_B.get()); BOOST_CHECK_EQUAL (xyz_A->size().width, xyz_B->size().width); BOOST_CHECK_EQUAL (xyz_A->size().height, xyz_B->size().height); diff --git a/test/smpte_load_font_test.cc b/test/smpte_load_font_test.cc index da52ed97..18894263 100644 --- a/test/smpte_load_font_test.cc +++ b/test/smpte_load_font_test.cc @@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE (smpte_load_font_test1) text->set_attribute ("ID", "my-great-id"); text->add_child_text ("urn:uuid:my-great-urn"); - dcp::SMPTELoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); + dcp::dc::SMPTELoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text))); BOOST_CHECK_EQUAL (lf.id, "my-great-id"); BOOST_CHECK_EQUAL (lf.urn, "my-great-urn"); diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc index fa7e2103..8b33b3d8 100644 --- a/test/sound_frame_test.cc +++ b/test/sound_frame_test.cc @@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE (sound_frame_test) int const frame_length = 2000; int const channels = 6; - dcp::SoundFrame frame ( + dcp::dc::SoundFrame frame ( private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf", 42, 0 @@ -60,11 +60,11 @@ BOOST_AUTO_TEST_CASE (sound_frame_test) BOOST_AUTO_TEST_CASE (sound_frame_test2) { - BOOST_CHECK_THROW (dcp::SoundFrame ("frobozz", 42, 0), dcp::FileError); - BOOST_CHECK_THROW (dcp::SoundFrame ( + BOOST_CHECK_THROW (dcp::dc::SoundFrame ("frobozz", 42, 0), dcp::dc::FileError); + BOOST_CHECK_THROW (dcp::dc::SoundFrame ( private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf", 999999999, 0 - ), dcp::DCPReadError + ), dcp::dc::DCPReadError ); } diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc index 154eb9e8..5dceb663 100644 --- a/test/subs_in_out.cc +++ b/test/subs_in_out.cc @@ -32,12 +32,12 @@ main (int argc, char* argv[]) } try { - dcp::InteropSubtitleAsset sc (argv[1]); + dcp::dc::InteropSubtitleAsset sc (argv[1]); cout << sc.xml_as_string (); } catch (exception& e) { cerr << "Could not load as interop: " << e.what() << "\n"; try { - dcp::SMPTESubtitleAsset sc (argv[1]); + dcp::dc::SMPTESubtitleAsset sc (argv[1]); cout << sc.xml_as_string(); } catch (exception& e) { cerr << "Could not load as SMPTE (" << e.what() << ")\n"; diff --git a/test/test.cc b/test/test.cc index 38e9c00e..65a70219 100644 --- a/test/test.cc +++ b/test/test.cc @@ -36,7 +36,7 @@ struct TestConfig { TestConfig() { - dcp::init (); + dcp::dc::init (); if (boost::unit_test::framework::master_test_suite().argc >= 2) { private_test = boost::unit_test::framework::master_test_suite().argv[1]; } @@ -114,9 +114,9 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) { uintmax_t N = boost::filesystem::file_size (ref); BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check)); - FILE* ref_file = dcp::fopen_boost (ref, "rb"); + FILE* ref_file = dcp::dc::fopen_boost (ref, "rb"); BOOST_CHECK (ref_file); - FILE* check_file = dcp::fopen_boost (check, "rb"); + FILE* check_file = dcp::dc::fopen_boost (check, "rb"); BOOST_CHECK (check_file); int const buffer_size = 65536; diff --git a/test/text_test.cc b/test/text_test.cc index 9fff25d6..e192e187 100644 --- a/test/text_test.cc +++ b/test/text_test.cc @@ -31,9 +31,9 @@ BOOST_AUTO_TEST_CASE (text_test1) text->set_attribute("VAlign", "top"); text->add_child_text("Hello world"); - dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, "Id"); + dcp::dc::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, "Id"); BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001); - BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP); + BOOST_CHECK_EQUAL (t.v_align, dcp::dc::VALIGN_TOP); BOOST_CHECK_EQUAL (t.text, "Hello world"); } @@ -46,8 +46,8 @@ BOOST_AUTO_TEST_CASE (text_test2) text->set_attribute("Valign", "top"); text->add_child_text("Hello world"); - dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, "Id"); + dcp::dc::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, "Id"); BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001); - BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP); + BOOST_CHECK_EQUAL (t.v_align, dcp::dc::VALIGN_TOP); BOOST_CHECK_EQUAL (t.text, "Hello world"); } diff --git a/test/util_test.cc b/test/util_test.cc index eea1c799..686f122e 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (base64_decode_test) } unsigned char decoded[N]; - int const r = dcp::base64_decode (s, decoded, N); + int const r = dcp::dc::base64_decode (s, decoded, N); BOOST_CHECK_EQUAL (r, N); for (int i = 0; i < N; ++i) { @@ -59,18 +59,18 @@ BOOST_AUTO_TEST_CASE (base64_decode_test) /** Test dcp::content_kind_from_string */ BOOST_AUTO_TEST_CASE (content_kind_test) { - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::SHORT); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::TRAILER); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::TEST); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::TRANSITIONAL); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::RATING); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::TEASER); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::POLICY); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ADVERTISEMENT); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("feature"), dcp::dc::FEATURE); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("Feature"), dcp::dc::FEATURE); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("FeaturE"), dcp::dc::FEATURE); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("Short"), dcp::dc::SHORT); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("trailer"), dcp::dc::TRAILER); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("test"), dcp::dc::TEST); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("transitional"), dcp::dc::TRANSITIONAL); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("rating"), dcp::dc::RATING); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("teaser"), dcp::dc::TEASER); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("policy"), dcp::dc::POLICY); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("psa"), dcp::dc::PUBLIC_SERVICE_ANNOUNCEMENT); + BOOST_CHECK_EQUAL (dcp::dc::content_kind_from_string ("advertisement"), dcp::dc::ADVERTISEMENT); } /** Test dcp::relative_to_root */ @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test) file /= "b"; file /= "c"; - boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + boost::optional<boost::filesystem::path> rel = dcp::dc::relative_to_root (root, file); BOOST_CHECK (rel); BOOST_CHECK_EQUAL (rel.get(), boost::filesystem::path ("c")); } @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test) boost::filesystem::path file = "a"; file /= "b"; - boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + boost::optional<boost::filesystem::path> rel = dcp::dc::relative_to_root (root, file); BOOST_CHECK (!rel); } @@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test) file /= "b"; file /= "c"; - boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + boost::optional<boost::filesystem::path> rel = dcp::dc::relative_to_root (root, file); BOOST_CHECK (rel); boost::filesystem::path check = "b"; @@ -120,5 +120,5 @@ BOOST_AUTO_TEST_CASE (relative_to_root_test) /** Test private_key_fingerprint() */ BOOST_AUTO_TEST_CASE (private_key_fingerprint_test) { - BOOST_CHECK_EQUAL (dcp::private_key_fingerprint (dcp::file_to_string ("test/data/private.key")), "Jdz1bFpCcKI7R16Ccx9JHYytag0="); + BOOST_CHECK_EQUAL (dcp::dc::private_key_fingerprint (dcp::dc::file_to_string ("test/data/private.key")), "Jdz1bFpCcKI7R16Ccx9JHYytag0="); } diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc index 8b50b0e3..b1e499fa 100644 --- a/test/write_subtitle_test.cc +++ b/test/write_subtitle_test.cc @@ -29,50 +29,50 @@ using boost::shared_ptr; /* Write some subtitle content as Interop XML and check that it is right */ BOOST_AUTO_TEST_CASE (write_subtitle_test) { - dcp::InteropSubtitleAsset c; + dcp::dc::InteropSubtitleAsset c; c.set_reel_number ("1"); c.set_language ("EN"); c.set_movie_title ("Test"); c.add ( - dcp::SubtitleString ( + dcp::dc::SubtitleString ( string ("Frutiger"), false, - dcp::Colour (255, 255, 255), + dcp::dc::Colour (255, 255, 255), 48, 1.0, - dcp::Time (0, 4, 9, 22, 24), - dcp::Time (0, 4, 11, 22, 24), + dcp::dc::Time (0, 4, 9, 22, 24), + dcp::dc::Time (0, 4, 11, 22, 24), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.8, - dcp::VALIGN_TOP, + dcp::dc::VALIGN_TOP, "Hello world", - dcp::NONE, - dcp::Colour (0, 0, 0), - dcp::Time (0, 0, 0, 0, 24), - dcp::Time (0, 0, 0, 0, 24) + dcp::dc::NONE, + dcp::dc::Colour (0, 0, 0), + dcp::dc::Time (0, 0, 0, 0, 24), + dcp::dc::Time (0, 0, 0, 0, 24) ) ); c.add ( - dcp::SubtitleString ( + dcp::dc::SubtitleString ( boost::optional<string> (), true, - dcp::Colour (128, 0, 64), + dcp::dc::Colour (128, 0, 64), 91, 1.0, - dcp::Time (5, 41, 0, 21, 24), - dcp::Time (6, 12, 15, 21, 24), + dcp::dc::Time (5, 41, 0, 21, 24), + dcp::dc::Time (6, 12, 15, 21, 24), 0, - dcp::HALIGN_CENTER, + dcp::dc::HALIGN_CENTER, 0.4, - dcp::VALIGN_BOTTOM, + dcp::dc::VALIGN_BOTTOM, "What's going on", - dcp::BORDER, - dcp::Colour (1, 2, 3), - dcp::Time (1, 2, 3, 4, 24), - dcp::Time (5, 6, 7, 8, 24) + dcp::dc::BORDER, + dcp::dc::Colour (1, 2, 3), + dcp::dc::Time (1, 2, 3, 4, 24), + dcp::dc::Time (5, 6, 7, 8, 24) ) ); diff --git a/tools/common.cc b/tools/common.cc index 5730848c..7ecdeb21 100644 --- a/tools/common.cc +++ b/tools/common.cc @@ -25,11 +25,11 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; void -dcp::filter_errors (dcp::DCP::ReadErrors& errors, bool ignore_missing_assets) +dcp::dc::filter_errors (dcp::dc::Package::ReadErrors& errors, bool ignore_missing_assets) { - for (DCP::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) { + for (Package::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) { - DCP::ReadErrors::iterator tmp = i; + Package::ReadErrors::iterator tmp = i; ++tmp; if (ignore_missing_assets && dynamic_pointer_cast<MissingAssetError> (*i)) { diff --git a/tools/common.h b/tools/common.h index a9c657ce..c2d3e91c 100644 --- a/tools/common.h +++ b/tools/common.h @@ -20,7 +20,9 @@ #include "exceptions.h" namespace dcp { +namespace dc { extern void filter_errors (std::list<boost::shared_ptr<DCPReadError> >& errors, bool ignore_missing_assets); } +} diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index 6fb2317b..af159d51 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -35,7 +35,7 @@ using std::string; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; static bool verbose = false; @@ -69,16 +69,16 @@ note (NoteType t, string n) } } -DCP * +Package * load_dcp (boost::filesystem::path path, bool keep_going, bool ignore_missing_assets, optional<string> key) { - DCP* dcp = 0; + Package* dcp = 0; try { - dcp = new DCP (path); - DCP::ReadErrors errors; + dcp = new Package (path); + Package::ReadErrors errors; dcp->read (keep_going, &errors); filter_errors (errors, ignore_missing_assets); - for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) { + for (Package::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) { cerr << (*i)->what() << "\n"; } @@ -189,8 +189,8 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - DCP* a = load_dcp (argv[optind], options.keep_going, ignore_missing_assets, key); - DCP* b = load_dcp (argv[optind + 1], options.keep_going, ignore_missing_assets, key); + Package* a = load_dcp (argv[optind], options.keep_going, ignore_missing_assets, key); + Package* b = load_dcp (argv[optind + 1], options.keep_going, ignore_missing_assets, key); /* I think this is just below the LSB at 16-bits (ie the 8th most significant bit at 24-bit) */ options.max_audio_sample_error = 255; diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc index ca98551b..237b3656 100644 --- a/tools/dcpdumpsub.cc +++ b/tools/dcpdumpsub.cc @@ -71,14 +71,14 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - dcp::SMPTESubtitleAsset sub (argv[optind]); + dcp::dc::SMPTESubtitleAsset sub (argv[optind]); cout << sub.xml_as_string() << "\n"; if (extract_fonts) { - map<string, dcp::Data> fonts = sub.fonts_with_load_ids (); - for (map<string, dcp::Data>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - FILE* f = dcp::fopen_boost (i->first + ".ttf", "wb"); + map<string, dcp::dc::Data> fonts = sub.fonts_with_load_ids (); + for (map<string, dcp::dc::Data>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { + FILE* f = dcp::dc::fopen_boost (i->first + ".ttf", "wb"); if (!f) { cerr << "Could not open font file " << i->first << ".ttf for writing"; exit (EXIT_FAILURE); diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index e15c164b..27e0603c 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -43,7 +43,7 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using namespace dcp; +using namespace dcp::dc; static void help (string n) @@ -153,10 +153,10 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - DCP* dcp = 0; - DCP::ReadErrors errors; + Package* dcp = 0; + Package::ReadErrors errors; try { - dcp = new DCP (argv[optind]); + dcp = new Package (argv[optind]); dcp->read (keep_going, &errors); } catch (FileError& e) { cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n"; @@ -168,8 +168,8 @@ main (int argc, char* argv[]) cout << "DCP: " << boost::filesystem::path(argv[optind]).filename().string() << "\n"; - dcp::filter_errors (errors, ignore_missing_assets); - for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) { + dcp::dc::filter_errors (errors, ignore_missing_assets); + for (Package::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) { cerr << "Error: " << (*i)->what() << "\n"; } @@ -180,13 +180,13 @@ def create_version_cc(bld, version): try: text = '#include "version.h"\n' - text += 'char const * dcp::git_commit = \"%s\";\n' % commit - text += 'char const * dcp::version = \"%s\";\n' % version + text += 'char const * dcp::dc::git_commit = \"%s\";\n' % commit + text += 'char const * dcp::dc::version = \"%s\";\n' % version if bld.env.ENABLE_DEBUG: debug_string = 'true' else: debug_string = 'false' - text += 'bool const dcp::built_with_debug = %s;\n' % debug_string + text += 'bool const dcp::dc::built_with_debug = %s;\n' % debug_string print('Writing version information to src/version.cc') o = open('src/version.cc', 'w') o.write(text) |