X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=3cf46220ecde40a0d7b259351edfddf29964636d;hb=5b3e3df6c9352e31dd932a5af215eabbf2cf27c8;hp=ea11cf0bd2b15247da968a626ec5fd06f54e394a;hpb=dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index ea11cf0bd..3cf46220e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -28,7 +28,8 @@ #include "job_manager.h" #include "transcode_job.h" #include "upload_job.h" -#include "log.h" +#include "null_log.h" +#include "file_log.h" #include "exceptions.h" #include "examine_content_job.h" #include "config.h" @@ -47,6 +48,8 @@ #include "video_content.h" #include "subtitle_content.h" #include "ffmpeg_content.h" +#include "dcp_content.h" +#include "screen_kdm.h" #include #include #include @@ -77,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. @@ -121,8 +125,10 @@ Film::Film (boost::filesystem::path dir, bool log) , _audio_channels (6) , _three_d (false) , _sequence_video (true) - , _interop (false) + , _interop (Config::instance()->default_interop ()) , _audio_processor (0) + , _reel_type (REELTYPE_SINGLE) + , _reel_length (2000000000) , _state_version (current_state_version) , _dirty (false) { @@ -161,8 +167,12 @@ Film::Film (boost::filesystem::path dir, bool log) Film::~Film () { - for (list::const_iterator i = _job_connections.begin(); i != _job_connections.end(); ++i) { - i->disconnect (); + BOOST_FOREACH (boost::signals2::connection& i, _job_connections) { + i.disconnect (); + } + + BOOST_FOREACH (boost::signals2::connection& i, _audio_analysis_connections) { + i.disconnect (); } } @@ -201,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); } @@ -216,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 @@ -282,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) { @@ -337,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; @@ -359,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"); @@ -367,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"); @@ -420,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); @@ -553,15 +568,13 @@ Film::isdcf_name (bool if_created_now) const d << "_" << container()->isdcf_name(); } - ContentList cl = content (); - /* XXX: this uses the first bit of content only */ /* The standard says we don't do this for trailers, for some strange reason */ if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) { Ratio const * content_ratio = 0; - for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) { - shared_ptr vc = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr vc = dynamic_pointer_cast (i); if (vc) { /* Here's the first piece of video content */ if (vc->scale().ratio ()) { @@ -612,8 +625,8 @@ Film::isdcf_name (bool if_created_now) const } } else { list mapped; - for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { - shared_ptr ac = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr ac = dynamic_pointer_cast (i); if (ac) { list c = ac->audio_mapping().mapped_output_channels (); copy (c.begin(), c.end(), back_inserter (mapped)); @@ -671,8 +684,18 @@ Film::isdcf_name (bool if_created_now) const d << "-3D"; } - if (!dm.package_type.empty ()) { - d << "_" << dm.package_type; + bool vf = false; + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr dc = dynamic_pointer_cast (i); + if (dc && (dc->reference_video() || dc->reference_audio() || dc->reference_subtitle())) { + vf = true; + } + } + + if (vf) { + d << "_VF"; + } else { + d << "_OV"; } return d.str (); @@ -801,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) { @@ -828,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"; @@ -836,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"; } @@ -946,8 +983,19 @@ Film::maybe_add_content (weak_ptr j, weak_ptr c) } shared_ptr content = c.lock (); - if (content) { - add_content (content); + if (!content) { + return; + } + + add_content (content); + if (Config::instance()->automatic_audio_analysis ()) { + shared_ptr playlist (new Playlist); + playlist->add (content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio ( + shared_from_this (), playlist, c, bind (&Film::audio_analysis_finished, this) + ); + _audio_analysis_connections.push_back (c); } } @@ -980,6 +1028,7 @@ Film::move_content_later (shared_ptr c) _playlist->move_later (c); } +/** @return length of the film from time 0 to the last thing on the playlist */ DCPTime Film::length () const { @@ -1082,7 +1131,7 @@ Film::make_kdm ( ).encrypt (signer, target, formulation); } -list +list Film::make_kdms ( list > screens, boost::filesystem::path dcp, @@ -1091,11 +1140,11 @@ Film::make_kdms ( dcp::Formulation formulation ) const { - list kdms; + list kdms; - for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { - if ((*i)->certificate) { - kdms.push_back (make_kdm ((*i)->certificate.get(), dcp, from, until, formulation)); + BOOST_FOREACH (shared_ptr i, screens) { + if (i->certificate) { + kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation))); } } @@ -1232,3 +1281,66 @@ Film::remove_content (ContentList c) { _playlist->remove (c); } + +void +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; +}