X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=6c0b4d5a541a2deb32fabd851f85fcf8fc60d0f7;hb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;hp=37d5c344743e96895ecbd5b5c9cde8ec77ffac59;hpb=9d63be286e8bc09dd1cf8deea5c58dda0a534c1e;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 37d5c3447..6c0b4d5a5 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -80,14 +80,15 @@ using std::make_pair; using std::cout; using std::list; using std::set; +using std::runtime_error; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; -#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); -#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, Log::TYPE_GENERAL); +#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); /* 5 -> 6 * AudioMapping XML changed. @@ -126,6 +127,8 @@ Film::Film (boost::filesystem::path dir, bool log) , _sequence_video (true) , _interop (Config::instance()->default_interop ()) , _audio_processor (0) + , _reel_type (REELTYPE_SINGLE) + , _reel_length (2000000000) , _state_version (current_state_version) , _dirty (false) { @@ -208,11 +211,11 @@ Film::video_identifier () const /** @return The file to write video frame info to */ boost::filesystem::path -Film::info_file () const +Film::info_file (DCPTimePeriod period) const { boost::filesystem::path p; p /= "info"; - p /= video_identifier (); + p /= video_identifier () + "_" + raw_convert (period.from.get()) + "_" + raw_convert (period.to.get()); return file (p); } @@ -223,9 +226,9 @@ Film::internal_video_asset_dir () const } boost::filesystem::path -Film::internal_video_asset_filename () const +Film::internal_video_asset_filename (DCPTimePeriod p) const { - return video_identifier() + ".mxf"; + return video_identifier() + "_" + raw_convert (p.from.get()) + "_" + raw_convert (p.to.get()) + ".mxf"; } boost::filesystem::path @@ -289,7 +292,7 @@ Film::make_dcp () } if (content().empty()) { - throw StringError (_("You must add some content to the DCP before creating it")); + throw runtime_error (_("You must add some content to the DCP before creating it")); } if (dcp_content_type() == 0) { @@ -344,6 +347,8 @@ Film::metadata () const if (_audio_processor) { root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); } + root->add_child("ReelType")->add_child_text (raw_convert (_reel_type)); + root->add_child("ReelLength")->add_child_text (raw_convert (_reel_length)); _playlist->as_xml (root->add_child ("Playlist")); return doc; @@ -366,7 +371,7 @@ 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!")); + throw runtime_error (_("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::Document f ("Metadata"); @@ -374,7 +379,7 @@ Film::read_metadata () _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!")); + throw runtime_error (_("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"); @@ -427,6 +432,9 @@ Film::read_metadata () _audio_processor = 0; } + _reel_type = static_cast (f.optional_number_child("ReelType").get_value_or (static_cast(REELTYPE_SINGLE))); + _reel_length = f.optional_number_child("ReelLength").get_value_or (2000000000); + 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); @@ -816,6 +824,20 @@ Film::set_audio_processor (AudioProcessor const * processor) signal_changed (AUDIO_CHANNELS); } +void +Film::set_reel_type (ReelType t) +{ + _reel_type = t; + signal_changed (REEL_TYPE); +} + +void +Film::set_reel_length (int64_t r) +{ + _reel_length = r; + signal_changed (REEL_LENGTH); +} + void Film::signal_changed (Property p) { @@ -843,7 +865,7 @@ Film::set_isdcf_date_today () } boost::filesystem::path -Film::j2c_path (int f, Eyes e, bool t) const +Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const { boost::filesystem::path p; p /= "j2c"; @@ -851,17 +873,17 @@ Film::j2c_path (int f, Eyes e, bool t) const SafeStringStream s; s.width (8); - s << setfill('0') << f; + s << setfill('0') << reel << "_" << frame; - if (e == EYES_LEFT) { + if (eyes == EYES_LEFT) { s << ".L"; - } else if (e == EYES_RIGHT) { + } else if (eyes == EYES_RIGHT) { s << ".R"; } s << ".j2c"; - if (t) { + if (tmp) { s << ".tmp"; } @@ -1091,7 +1113,8 @@ Film::frame_size () const dcp::EncryptedKDM Film::make_kdm ( - dcp::Certificate target, + dcp::Certificate recipient, + vector trusted_devices, boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, @@ -1106,7 +1129,7 @@ Film::make_kdm ( return dcp::DecryptedKDM ( cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string() - ).encrypt (signer, target, formulation); + ).encrypt (signer, recipient, trusted_devices, formulation); } list @@ -1121,8 +1144,8 @@ Film::make_kdms ( list kdms; BOOST_FOREACH (shared_ptr i, screens) { - if (i->certificate) { - kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation))); + if (i->recipient) { + kdms.push_back (ScreenKDM (i, make_kdm (i->recipient.get(), i->trusted_devices, dcp, from, until, formulation))); } } @@ -1231,6 +1254,8 @@ Film::audio_output_names () const return audio_processor()->input_names (); } + DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16); + vector n; n.push_back (_("L")); n.push_back (_("R")); @@ -1244,6 +1269,10 @@ Film::audio_output_names () const n.push_back (_("Rc")); n.push_back (_("BsL")); n.push_back (_("BsR")); + n.push_back (_("DBP")); + n.push_back (_("DBS")); + n.push_back (_("NC")); + n.push_back (_("NC")); return vector (n.begin(), n.begin() + audio_channels ()); } @@ -1265,3 +1294,60 @@ Film::audio_analysis_finished () { /* XXX */ } + +list +Film::reels () const +{ + list p; + DCPTime const len = length().round_up (video_frame_rate ()); + + switch (reel_type ()) { + case REELTYPE_SINGLE: + p.push_back (DCPTimePeriod (DCPTime (), len)); + break; + case REELTYPE_BY_VIDEO_CONTENT: + { + optional last_split; + shared_ptr last_video; + ContentList cl = content (); + BOOST_FOREACH (shared_ptr c, content ()) { + shared_ptr v = dynamic_pointer_cast (c); + if (v) { + BOOST_FOREACH (DCPTime t, v->reel_split_points()) { + if (last_split) { + p.push_back (DCPTimePeriod (last_split.get(), t)); + } + last_split = t; + } + last_video = v; + } + } + + DCPTime video_end = last_video ? last_video->end() : DCPTime(0); + if (last_split) { + /* Definitely go from the last split to the end of the video content */ + p.push_back (DCPTimePeriod (last_split.get(), video_end)); + } + + if (video_end < len) { + /* And maybe go after that as well if there is any non-video hanging over the end */ + p.push_back (DCPTimePeriod (video_end, len)); + } + break; + } + case REELTYPE_BY_LENGTH: + { + DCPTime current; + /* Integer-divide reel length by the size of one frame to give the number of frames per reel */ + Frame const reel_in_frames = _reel_length / ((j2k_bandwidth() / video_frame_rate()) / 8); + while (current < len) { + DCPTime end = min (len, current + DCPTime::from_frames (reel_in_frames, video_frame_rate ())); + p.push_back (DCPTimePeriod (current, end)); + current = end; + } + break; + } + } + + return p; +}