X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=e885fe5fd350f804fb8e0e8ec489005da6b4501d;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=13c1558e96a077b53d87058614dbffc6dd9ecc05;hpb=987a92d9906b306fb74ab65b578aa5bb510bea43;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 13c1558e9..e885fe5fd 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "film.h" #include "job.h" #include "util.h" @@ -49,6 +51,7 @@ #include "dcp_content_type.h" #include "ratio.h" #include "cross.h" +#include "cinema.h" #include "i18n.h" @@ -80,10 +83,10 @@ int const Film::state_version = 4; /** Construct a Film object in a given directory. * - * @param d Film directory. + * @param dir Film directory. */ -Film::Film (string d) +Film::Film (boost::filesystem::path dir) : _playlist (new Playlist) , _use_dci_name (true) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) @@ -91,12 +94,14 @@ Film::Film (string d) , _resolution (RESOLUTION_2K) , _scaler (Scaler::from_id ("bicubic")) , _with_subtitles (false) + , _encrypted (false) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) , _dci_metadata (Config::instance()->default_dci_metadata ()) , _video_frame_rate (24) , _audio_channels (MAX_AUDIO_CHANNELS) , _three_d (false) , _sequence_video (true) + , _interop (false) , _dirty (false) { set_dci_date_today (); @@ -108,7 +113,7 @@ Film::Film (string d) (Code swiped from Adam Bowen on stackoverflow) */ - boost::filesystem::path p (boost::filesystem::system_complete (d)); + boost::filesystem::path p (boost::filesystem::system_complete (dir)); boost::filesystem::path result; for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) { if (*i == "..") { @@ -142,6 +147,12 @@ Film::video_identifier () const << "_" << scaler()->id() << "_" << j2k_bandwidth(); + if (_interop) { + s << "_I"; + } else { + s << "_S"; + } + if (_three_d) { s << "_3D"; } @@ -302,7 +313,6 @@ Film::write_metadata () const boost::filesystem::create_directory (directory()); } - boost::mutex::scoped_lock lm (_state_mutex); LocaleGuard lg; boost::filesystem::create_directories (directory()); @@ -332,6 +342,8 @@ Film::write_metadata () const root->add_child("AudioChannels")->add_child_text (lexical_cast (_audio_channels)); root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0"); + root->add_child("Interop")->add_child_text (_interop ? "1" : "0"); + root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); _playlist->as_xml (root->add_child ("Playlist")); doc.write_to_file_formatted (file ("metadata.xml")); @@ -343,14 +355,14 @@ Film::write_metadata () const void Film::read_metadata () { - boost::mutex::scoped_lock lm (_state_mutex); LocaleGuard lg; if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) { throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!")); } - cxml::File f (file ("metadata.xml"), "Metadata"); + cxml::Document f ("Metadata"); + f.read_file (file ("metadata.xml")); _name = f.string_child ("Name"); _use_dci_name = f.bool_child ("UseDCIName"); @@ -379,6 +391,7 @@ Film::read_metadata () _audio_channels = f.number_child ("AudioChannels"); _sequence_video = f.bool_child ("SequenceVideo"); _three_d = f.bool_child ("ThreeD"); + _interop = f.bool_child ("Interop"); _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist")); @@ -391,8 +404,6 @@ Film::read_metadata () string Film::dir (string d) const { - boost::mutex::scoped_lock lm (_directory_mutex); - boost::filesystem::path p; p /= _directory; p /= d; @@ -403,14 +414,11 @@ Film::dir (string d) const } /** Given a file or directory name, return its full path within the Film's directory. - * _directory_mutex must not be locked on entry. * Any required parent directories will be created. */ string Film::file (string f) const { - boost::mutex::scoped_lock lm (_directory_mutex); - boost::filesystem::path p; p /= _directory; p /= f; @@ -442,6 +450,7 @@ Film::dci_name (bool if_created_now) const if (dcp_content_type()) { d << "_" << dcp_content_type()->dci_name(); + d << "-" << dci_metadata().content_version; } if (three_d ()) { @@ -533,7 +542,6 @@ Film::dcp_name (bool if_created_now) const void Film::set_directory (string d) { - boost::mutex::scoped_lock lm (_state_mutex); _directory = d; _dirty = true; } @@ -541,130 +549,98 @@ Film::set_directory (string d) void Film::set_name (string n) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _name = n; - } + _name = n; signal_changed (NAME); } void Film::set_use_dci_name (bool u) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _use_dci_name = u; - } + _use_dci_name = u; signal_changed (USE_DCI_NAME); } void Film::set_dcp_content_type (DCPContentType const * t) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _dcp_content_type = t; - } + _dcp_content_type = t; signal_changed (DCP_CONTENT_TYPE); } void Film::set_container (Ratio const * c) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _container = c; - } + _container = c; signal_changed (CONTAINER); } void Film::set_resolution (Resolution r) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _resolution = r; - } + _resolution = r; signal_changed (RESOLUTION); } void Film::set_scaler (Scaler const * s) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _scaler = s; - } + _scaler = s; signal_changed (SCALER); } void Film::set_with_subtitles (bool w) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _with_subtitles = w; - } + _with_subtitles = w; signal_changed (WITH_SUBTITLES); } void Film::set_j2k_bandwidth (int b) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _j2k_bandwidth = b; - } + _j2k_bandwidth = b; signal_changed (J2K_BANDWIDTH); } void Film::set_dci_metadata (DCIMetadata m) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _dci_metadata = m; - } + _dci_metadata = m; signal_changed (DCI_METADATA); } void Film::set_video_frame_rate (int f) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _video_frame_rate = f; - } + _video_frame_rate = f; signal_changed (VIDEO_FRAME_RATE); } void Film::set_audio_channels (int c) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _audio_channels = c; - } + _audio_channels = c; signal_changed (AUDIO_CHANNELS); } void Film::set_three_d (bool t) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _three_d = t; - } + _three_d = t; signal_changed (THREE_D); } +void +Film::set_interop (bool i) +{ + _interop = i; + signal_changed (INTEROP); +} + void Film::signal_changed (Property p) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _dirty = true; - } + _dirty = true; switch (p) { case Film::CONTENT: @@ -766,10 +742,16 @@ Film::make_player () const return shared_ptr (new Player (shared_from_this (), _playlist)); } +void +Film::set_encrypted (bool e) +{ + _encrypted = e; + signal_changed (ENCRYPTED); +} + shared_ptr Film::playlist () const { - boost::mutex::scoped_lock lm (_state_mutex); return _playlist; } @@ -806,7 +788,7 @@ Film::add_content (shared_ptr c) { /* Add video content after any existing content */ if (dynamic_pointer_cast (c)) { - c->set_start (_playlist->video_end ()); + c->set_position (_playlist->video_end ()); } _playlist->add (c); @@ -888,12 +870,8 @@ Film::audio_frame_rate () const void Film::set_sequence_video (bool s) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _sequence_video = s; - _playlist->set_sequence_video (s); - } - + _sequence_video = s; + _playlist->set_sequence_video (s); signal_changed (SEQUENCE_VIDEO); } @@ -910,3 +888,71 @@ Film::full_frame () const assert (false); return libdcp::Size (); } + +void +Film::make_kdms ( + list > screens, + boost::posix_time::ptime from, + boost::posix_time::ptime until, + string directory + ) const +{ + string const cd = Config::instance()->crypt_chain_directory (); + if (boost::filesystem::is_empty (cd)) { + libdcp::make_crypt_chain (cd); + } + + libdcp::CertificateChain chain; + + { + boost::filesystem::path p (cd); + p /= "ca.self-signed.pem"; + chain.add (shared_ptr (new libdcp::Certificate (p.string ()))); + } + + { + boost::filesystem::path p (cd); + p /= "intermediate.signed.pem"; + chain.add (shared_ptr (new libdcp::Certificate (p.string ()))); + } + + { + boost::filesystem::path p (cd); + p /= "leaf.signed.pem"; + chain.add (shared_ptr (new libdcp::Certificate (p.string ()))); + } + + boost::filesystem::path signer_key (cd); + signer_key /= "leaf.key"; + + /* Find the DCP to make the KDM for */ + string const dir = this->directory (); + list dcps; + for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) { + if (boost::filesystem::is_directory (*i) && i->path().leaf() != "j2c" && i->path().leaf() != "wavs") { + dcps.push_back (i->path().string()); + } + } + + if (dcps.empty()) { + throw KDMError ("Could not find DCP to make KDM for"); + } else if (dcps.size() > 1) { + throw KDMError ("More than one possible DCP to make KDM for"); + } + + for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { + + libdcp::DCP dcp (dcps.front ()); + dcp.read (); + + /* XXX: single CPL only */ + shared_ptr kdm = dcp.cpls().front()->make_kdm ( + chain, signer_key.string(), (*i)->certificate, from, until, _interop, libdcp::MXFMetadata (), Config::instance()->dcp_metadata () + ); + + boost::filesystem::path out = directory; + out /= "kdm.xml"; + kdm->write_to_file_formatted (out.string()); + } +} +