X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=932048d8b2997418bcb3b8902777c4631d8fdb60;hb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;hp=085675d071290561b622a7ec1f0e9c3dce657833;hpb=6b35b4764ac5446c845a1dde9a01e0401862d835;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 085675d07..932048d8b 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -64,8 +64,6 @@ using std::multimap; using std::pair; using std::map; using std::vector; -using std::ifstream; -using std::ofstream; using std::setfill; using std::min; using std::make_pair; @@ -83,7 +81,7 @@ using boost::optional; using libdcp::Size; using libdcp::Signer; -int const Film::state_version = 4; +int const Film::state_version = 5; /** Construct a Film object in a given directory. * @@ -98,6 +96,7 @@ Film::Film (boost::filesystem::path dir) , _resolution (RESOLUTION_2K) , _scaler (Scaler::from_id ("bicubic")) , _with_subtitles (false) + , _signed (true) , _encrypted (false) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) , _dci_metadata (Config::instance()->default_dci_metadata ()) @@ -131,7 +130,7 @@ Film::Film (boost::filesystem::path dir) } } - set_directory (result.string ()); + set_directory (result); _log.reset (new FileLog (file ("log"))); _playlist->set_sequence_video (_sequence_video); @@ -151,6 +150,12 @@ Film::video_identifier () const << "_" << scaler()->id() << "_" << j2k_bandwidth(); + if (encrypted ()) { + s << "_E"; + } else { + s << "_P"; + } + if (_interop) { s << "_I"; } else { @@ -165,34 +170,34 @@ Film::video_identifier () const } /** @return The path to the directory to write video frame info files to */ -string +boost::filesystem::path Film::info_dir () const { boost::filesystem::path p; p /= "info"; p /= video_identifier (); - return dir (p.string()); + return dir (p); } -string +boost::filesystem::path Film::internal_video_mxf_dir () const { return dir ("video"); } -string +boost::filesystem::path Film::internal_video_mxf_filename () const { return video_identifier() + ".mxf"; } -string +boost::filesystem::path Film::video_mxf_filename () const { return filename_safe_name() + "_video.mxf"; } -string +boost::filesystem::path Film::audio_mxf_filename () const { return filename_safe_name() + "_audio.mxf"; @@ -313,13 +318,13 @@ Film::encoded_frames () const void Film::write_metadata () const { - if (!boost::filesystem::exists (directory())) { - boost::filesystem::create_directory (directory()); + if (!boost::filesystem::exists (directory ())) { + boost::filesystem::create_directory (directory ()); } LocaleGuard lg; - boost::filesystem::create_directories (directory()); + boost::filesystem::create_directories (directory ()); xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Metadata"); @@ -347,11 +352,12 @@ Film::write_metadata () const 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("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); _playlist->as_xml (root->add_child ("Playlist")); - doc.write_to_file_formatted (file ("metadata.xml")); + doc.write_to_file_formatted (file("metadata.xml").string ()); _dirty = false; } @@ -368,6 +374,8 @@ Film::read_metadata () cxml::Document f ("Metadata"); f.read_file (file ("metadata.xml")); + + int const version = f.number_child ("Version"); _name = f.string_child ("Name"); _use_dci_name = f.bool_child ("UseDCIName"); @@ -393,13 +401,14 @@ Film::read_metadata () _dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); _video_frame_rate = f.number_child ("VideoFrameRate"); _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); + _signed = f.optional_bool_child("Signed").get_value_or (true); _encrypted = f.bool_child ("Encrypted"); _audio_channels = f.number_child ("AudioChannels"); _sequence_video = f.bool_child ("SequenceVideo"); _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); _key = libdcp::Key (f.string_child ("Key")); - _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist")); + _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), version); _dirty = false; } @@ -407,8 +416,8 @@ Film::read_metadata () /** Given a directory name, return its full path within the Film's directory. * The directory (and its parents) will be created if they do not exist. */ -string -Film::dir (string d) const +boost::filesystem::path +Film::dir (boost::filesystem::path d) const { boost::filesystem::path p; p /= _directory; @@ -416,14 +425,14 @@ Film::dir (string d) const boost::filesystem::create_directories (p); - return p.string (); + return p; } /** Given a file or directory name, return its full path within the Film's directory. * Any required parent directories will be created. */ -string -Film::file (string f) const +boost::filesystem::path +Film::file (boost::filesystem::path f) const { boost::filesystem::path p; p /= _directory; @@ -431,7 +440,7 @@ Film::file (string f) const boost::filesystem::create_directories (p.parent_path ()); - return p.string (); + return p; } /** @return a DCI-compliant name for a DCP of this film */ @@ -475,7 +484,7 @@ Film::dci_name (bool if_created_now) const if (!dm.audio_language.empty ()) { d << "_" << dm.audio_language; - if (!dm.subtitle_language.empty() && with_subtitles()) { + if (!dm.subtitle_language.empty()) { d << "-" << dm.subtitle_language; } else { d << "-XX"; @@ -546,7 +555,7 @@ Film::dcp_name (bool if_created_now) const void -Film::set_directory (string d) +Film::set_directory (boost::filesystem::path d) { _directory = d; _dirty = true; @@ -671,7 +680,7 @@ Film::set_dci_date_today () _dci_date = boost::gregorian::day_clock::local_day (); } -string +boost::filesystem::path Film::info_path (int f, Eyes e) const { boost::filesystem::path p; @@ -694,10 +703,10 @@ Film::info_path (int f, Eyes e) const /* info_dir() will already have added any initial bit of the path, so don't call file() on this. */ - return p.string (); + return p; } -string +boost::filesystem::path Film::j2c_path (int f, Eyes e, bool t) const { boost::filesystem::path p; @@ -721,25 +730,33 @@ Film::j2c_path (int f, Eyes e, bool t) const } p /= s.str(); - return file (p.string ()); + return file (p); } -/** Make an educated guess as to whether we have a complete DCP - * or not. - * @return true if we do. - */ - -bool -Film::have_dcp () const +/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */ +list +Film::dcps () const { - try { - libdcp::DCP dcp (dir (dcp_name())); - dcp.read (); - } catch (...) { - return false; - } + list out; + + boost::filesystem::path const dir = directory (); + 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() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis" + ) { + + try { + libdcp::DCP dcp (*i); + dcp.read (); + out.push_back (i->path().leaf ()); + } catch (...) { - return true; + } + } + } + + return out; } shared_ptr @@ -748,6 +765,13 @@ Film::make_player () const return shared_ptr (new Player (shared_from_this (), _playlist)); } +void +Film::set_signed (bool s) +{ + _signed = s; + signal_changed (SIGNED); +} + void Film::set_encrypted (bool e) { @@ -818,7 +842,7 @@ Film::move_content_later (shared_ptr c) _playlist->move_later (c); } -Time +DCPTime Film::length () const { return _playlist->length (); @@ -830,12 +854,18 @@ Film::has_subtitles () const return _playlist->has_subtitles (); } -OutputVideoFrame +VideoFrame Film::best_video_frame_rate () const { return _playlist->best_dcp_frame_rate (); } +FrameRateChange +Film::active_frame_rate_change (DCPTime t) const +{ + return _playlist->active_frame_rate_change (t, video_frame_rate ()); +} + void Film::playlist_content_changed (boost::weak_ptr c, int p) { @@ -854,31 +884,31 @@ Film::playlist_changed () signal_changed (CONTENT); } -OutputAudioFrame -Film::time_to_audio_frames (Time t) const +AudioFrame +Film::time_to_audio_frames (DCPTime t) const { return t * audio_frame_rate () / TIME_HZ; } -OutputVideoFrame -Film::time_to_video_frames (Time t) const +VideoFrame +Film::time_to_video_frames (DCPTime t) const { return t * video_frame_rate () / TIME_HZ; } -Time -Film::audio_frames_to_time (OutputAudioFrame f) const +DCPTime +Film::audio_frames_to_time (AudioFrame f) const { return f * TIME_HZ / audio_frame_rate (); } -Time -Film::video_frames_to_time (OutputVideoFrame f) const +DCPTime +Film::video_frames_to_time (VideoFrame f) const { return f * TIME_HZ / video_frame_rate (); } -OutputAudioFrame +AudioFrame Film::audio_frame_rate () const { /* XXX */ @@ -910,28 +940,14 @@ Film::full_frame () const libdcp::KDM Film::make_kdm ( shared_ptr target, + boost::filesystem::path dcp_dir, boost::posix_time::ptime from, boost::posix_time::ptime until ) const { shared_ptr signer = make_signer (); - /* 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() != "video" && i->path().leaf() != "info") { - dcps.push_back (i->path()); - } - } - - 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")); - } - - libdcp::DCP dcp (dcps.front ()); + libdcp::DCP dcp (dir (dcp_dir.string ())); try { dcp.read (); @@ -951,6 +967,7 @@ Film::make_kdm ( list Film::make_kdms ( list > screens, + boost::filesystem::path dcp, boost::posix_time::ptime from, boost::posix_time::ptime until ) const @@ -958,7 +975,7 @@ Film::make_kdms ( list kdms; for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { - kdms.push_back (make_kdm ((*i)->certificate, from, until)); + kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until)); } return kdms;