X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=bdd650437568cd62ce2702ac931383384cc20666;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=099bacfdcb7b5513358f968555e03a864703e338;hpb=4e5d5c7dcc6470b8dc918d03a00e30c07df60efe;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 099bacfdc..bdd650437 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,14 +28,14 @@ #include #include #include -#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "film.h" #include "job.h" #include "util.h" @@ -72,26 +72,30 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::weak_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; using boost::to_upper_copy; using boost::ends_with; using boost::starts_with; using boost::optional; -using libdcp::Size; -using libdcp::Signer; +using dcp::Size; +using dcp::Signer; +using dcp::raw_convert; /* 5 -> 6 * AudioMapping XML changed. + * 6 -> 7 + * Subtitle offset changed to subtitle y offset, and subtitle x offset added. + * 7 -> 8 + * Use tag in rather than . */ -int const Film::state_version = 6; +int const Film::current_state_version = 8; /** Construct a Film object in a given directory. * * @param dir Film directory. */ -Film::Film (boost::filesystem::path dir) +Film::Film (boost::filesystem::path dir, bool log) : _playlist (new Playlist) , _use_dci_name (true) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) @@ -104,10 +108,11 @@ Film::Film (boost::filesystem::path dir) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) , _dci_metadata (Config::instance()->default_dci_metadata ()) , _video_frame_rate (24) - , _audio_channels (MAX_AUDIO_CHANNELS) + , _audio_channels (6) , _three_d (false) , _sequence_video (true) , _interop (false) + , _state_version (current_state_version) , _dirty (false) { set_dci_date_today (); @@ -134,7 +139,11 @@ Film::Film (boost::filesystem::path dir) } set_directory (result); - _log.reset (new FileLog (file ("log"))); + if (log) { + _log.reset (new FileLog (file ("log"))); + } else { + _log.reset (new NullLog); + } _playlist->set_sequence_video (_sequence_video); } @@ -143,9 +152,10 @@ string Film::video_identifier () const { assert (container ()); - LocaleGuard lg; stringstream s; + s.imbue (std::locale::classic ()); + s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() @@ -223,11 +233,9 @@ Film::filename_safe_name () const } boost::filesystem::path -Film::audio_analysis_path (shared_ptr c) const +Film::audio_analysis_dir () const { - boost::filesystem::path p = dir ("analysis"); - p /= c->digest(); - return p; + return dir ("analysis"); } /** Add suitable Jobs to the JobManager to create a DCP for this Film */ @@ -239,7 +247,12 @@ Film::make_dcp () if (dcp_name().find ("/") != string::npos) { throw BadSettingError (_("name"), _("cannot contain slashes")); } - + + /* It seems to make sense to auto-save metadata here, since the make DCP may last + a long time, and crashes/power failures are moderately likely. + */ + write_metadata (); + log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary())); { @@ -325,22 +338,13 @@ Film::encoded_frames () const return N; } -/** Write state to our `metadata' file */ -void -Film::write_metadata () const +shared_ptr +Film::metadata () const { - if (!boost::filesystem::exists (directory ())) { - boost::filesystem::create_directory (directory ()); - } - - LocaleGuard lg; + shared_ptr doc (new xmlpp::Document); + xmlpp::Element* root = doc->create_root_node ("Metadata"); - boost::filesystem::create_directories (directory ()); - - xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("Metadata"); - - root->add_child("Version")->add_child_text (lexical_cast (state_version)); + root->add_child("Version")->add_child_text (raw_convert (current_state_version)); root->add_child("Name")->add_child_text (_name); root->add_child("UseDCIName")->add_child_text (_use_dci_name ? "1" : "0"); @@ -355,11 +359,11 @@ Film::write_metadata () const root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution)); root->add_child("Scaler")->add_child_text (_scaler->id ()); root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0"); - root->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); + root->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); _dci_metadata.as_xml (root->add_child ("DCIMetadata")); - root->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); + root->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date)); - root->add_child("AudioChannels")->add_child_text (lexical_cast (_audio_channels)); + root->add_child("AudioChannels")->add_child_text (raw_convert (_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"); @@ -368,17 +372,25 @@ Film::write_metadata () const root->add_child("Key")->add_child_text (_key.hex ()); _playlist->as_xml (root->add_child ("Playlist")); - doc.write_to_file_formatted (file("metadata.xml").string ()); - - _dirty = false; + return doc; } -/** Read state from our metadata file */ +/** Write state to our `metadata' file */ void -Film::read_metadata () +Film::write_metadata () const { - LocaleGuard lg; + boost::filesystem::create_directories (directory ()); + shared_ptr doc = metadata (); + doc->write_to_file_formatted (file("metadata.xml").string ()); + _dirty = false; +} +/** Read state from our metadata file. + * @return Notes about things that the user should know about, or empty. + */ +list +Film::read_metadata () +{ 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!")); } @@ -386,7 +398,10 @@ Film::read_metadata () cxml::Document f ("Metadata"); f.read_file (file ("metadata.xml")); - int const version = f.number_child ("Version"); + _state_version = f.number_child ("Version"); + if (_state_version > current_state_version) { + throw StringError (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!")); + } _name = f.string_child ("Name"); _use_dci_name = f.bool_child ("UseDCIName"); @@ -418,10 +433,14 @@ Film::read_metadata () _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"), version); + _key = dcp::Key (f.string_child ("Key")); + + list notes; + /* This method is the only one that can return notes (so far) */ + _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes); _dirty = false; + return notes; } /** Given a directory name, return its full path within the Film's directory. @@ -744,7 +763,7 @@ Film::j2c_path (int f, Eyes e, bool t) const return file (p); } -/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */ +/** @return List of subdirectories (not full paths) containing DCPs that can be successfully dcp::DCP::read() */ list Film::dcps () const { @@ -758,7 +777,7 @@ Film::dcps () const ) { try { - libdcp::DCP dcp (*i); + dcp::DCP dcp (*i); dcp.read (); out.push_back (i->path().leaf ()); } catch (...) { @@ -805,6 +824,10 @@ Film::content () const void Film::examine_and_add_content (shared_ptr c) { + if (dynamic_pointer_cast (c)) { + run_ffprobe (c->path(0), file ("ffprobe.log"), _log); + } + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr (j), boost::weak_ptr (c))); JobManager::instance()->add (j); @@ -865,7 +888,7 @@ Film::has_subtitles () const return _playlist->has_subtitles (); } -VideoFrame +int Film::best_video_frame_rate () const { return _playlist->best_dcp_frame_rate (); @@ -895,31 +918,7 @@ Film::playlist_changed () signal_changed (CONTENT); } -AudioFrame -Film::time_to_audio_frames (DCPTime t) const -{ - return t * audio_frame_rate () / TIME_HZ; -} - -VideoFrame -Film::time_to_video_frames (DCPTime t) const -{ - return t * video_frame_rate () / TIME_HZ; -} - -DCPTime -Film::audio_frames_to_time (AudioFrame f) const -{ - return f * TIME_HZ / audio_frame_rate (); -} - -DCPTime -Film::video_frames_to_time (VideoFrame f) const -{ - return f * TIME_HZ / video_frame_rate (); -} - -AudioFrame +int Film::audio_frame_rate () const { /* XXX */ @@ -934,31 +933,39 @@ Film::set_sequence_video (bool s) signal_changed (SEQUENCE_VIDEO); } -libdcp::Size +/** @return Size of the largest possible image in whatever resolution we are using */ +dcp::Size Film::full_frame () const { switch (_resolution) { case RESOLUTION_2K: - return libdcp::Size (2048, 1080); + return dcp::Size (2048, 1080); case RESOLUTION_4K: - return libdcp::Size (4096, 2160); + return dcp::Size (4096, 2160); } assert (false); - return libdcp::Size (); + return dcp::Size (); +} + +/** @return Size of the frame */ +dcp::Size +Film::frame_size () const +{ + return fit_ratio_within (container()->ratio(), full_frame ()); } -libdcp::KDM +dcp::EncryptedKDM Film::make_kdm ( - shared_ptr target, + shared_ptr target, boost::filesystem::path dcp_dir, - boost::posix_time::ptime from, - boost::posix_time::ptime until + dcp::LocalTime from, + dcp::LocalTime until ) const { shared_ptr signer = make_signer (); - libdcp::DCP dcp (dir (dcp_dir.string ())); + dcp::DCP dcp (dir (dcp_dir.string ())); try { dcp.read (); @@ -966,24 +973,22 @@ Film::make_kdm ( throw KDMError (_("Could not read DCP to make KDM for")); } - time_t now = time (0); - struct tm* tm = localtime (&now); - string const issue_date = libdcp::tm_to_string (tm); - dcp.cpls().front()->set_mxf_keys (key ()); - return libdcp::KDM (dcp.cpls().front(), signer, target, from, until, "DCP-o-matic", issue_date); + return dcp::DecryptedKDM ( + dcp.cpls().front(), from, until, "DCP-o-matic", dcp.cpls().front()->content_title_text(), dcp::LocalTime().as_string() + ).encrypt (signer, target); } -list +list Film::make_kdms ( list > screens, boost::filesystem::path dcp, - boost::posix_time::ptime from, - boost::posix_time::ptime until + dcp::LocalTime from, + dcp::LocalTime until ) const { - list kdms; + list kdms; for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until)); @@ -998,7 +1003,7 @@ Film::make_kdms ( uint64_t Film::required_disk_space () const { - return uint64_t (j2k_bandwidth() / 8) * length() / TIME_HZ; + return uint64_t (j2k_bandwidth() / 8) * length().seconds(); } /** This method checks the disk that the Film is on and tries to decide whether or not