X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=bb210350e6fae4f4dc3baef7e1ee53db6f70be72;hb=8dddd2d1fef983f60df1f90984dd47f9e95256d6;hp=3709807b73fec46f46c44c431ea769cc525f9c7a;hpb=c6da4e500ebe3481bbb38db7e68a01c766fab50d;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 3709807b7..bb210350e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2013 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 @@ -31,6 +31,11 @@ #include #include #include +#include +#include +#include +#include +#include #include "film.h" #include "job.h" #include "util.h" @@ -49,6 +54,7 @@ #include "dcp_content_type.h" #include "ratio.h" #include "cross.h" +#include "cinema.h" #include "i18n.h" @@ -75,15 +81,16 @@ using boost::ends_with; using boost::starts_with; using boost::optional; using libdcp::Size; +using libdcp::Signer; 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,10 +98,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 ()) - , _dcp_video_frame_rate (24) - , _dcp_audio_channels (MAX_AUDIO_CHANNELS) + , _video_frame_rate (24) + , _audio_channels (MAX_AUDIO_CHANNELS) + , _three_d (false) + , _sequence_video (true) + , _interop (false) , _dirty (false) { set_dci_date_today (); @@ -106,7 +117,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 == "..") { @@ -120,8 +131,10 @@ Film::Film (string d) } } - set_directory (result.string ()); - _log.reset (new FileLog ("log")); + set_directory (result); + _log.reset (new FileLog (file ("log"))); + + _playlist->set_sequence_video (_sequence_video); } string @@ -134,10 +147,20 @@ Film::video_identifier () const s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() - << "_" << _dcp_video_frame_rate + << "_" << _video_frame_rate << "_" << scaler()->id() << "_" << j2k_bandwidth(); + if (_interop) { + s << "_I"; + } else { + s << "_S"; + } + + if (_three_d) { + s << "_3D"; + } + return s.str (); } @@ -164,13 +187,13 @@ Film::internal_video_mxf_filename () const } string -Film::dcp_video_mxf_filename () const +Film::video_mxf_filename () const { return filename_safe_name() + "_video.mxf"; } string -Film::dcp_audio_mxf_filename () const +Film::audio_mxf_filename () const { return filename_safe_name() + "_audio.mxf"; } @@ -216,13 +239,12 @@ Film::make_dcp () gethostname (buffer, sizeof (buffer)); log()->log (String::compose ("Starting to make DCP on %1", buffer)); } - -// log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? _("still") : _("video")))); -// if (length()) { -// log()->log (String::compose ("Content length %1", length().get())); -// } -// log()->log (String::compose ("Content digest %1", content_digest())); -// log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate())); + + ContentList cl = content (); + for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { + log()->log (String::compose ("Content: %1", (*i)->technical_summary())); + } + log()->log (String::compose ("DCP video rate %1 fps", video_frame_rate())); log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads())); log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth())); #ifdef DCPOMATIC_DEBUG @@ -235,8 +257,7 @@ Film::make_dcp () #else log()->log ("libdcp built in optimised mode."); #endif - pair const c = cpu_info (); - log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second)); + log()->log (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ())); list > const m = mount_info (); for (list >::const_iterator i = m.begin(); i != m.end(); ++i) { log()->log (String::compose ("Mount: %1 %2", i->first, i->second)); @@ -246,7 +267,7 @@ Film::make_dcp () throw MissingSettingError (_("container")); } - if (_playlist->content().empty ()) { + if (content().empty()) { throw StringError (_("You must add some content to the DCP before creating it")); } @@ -292,14 +313,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 ()); } - boost::mutex::scoped_lock lm (_state_mutex); LocaleGuard lg; - boost::filesystem::create_directories (directory()); + boost::filesystem::create_directories (directory ()); xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Metadata"); @@ -321,9 +341,14 @@ Film::write_metadata () const root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0"); root->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); _dci_metadata.as_xml (root->add_child ("DCIMetadata")); - root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast (_dcp_video_frame_rate)); + root->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date)); - root->add_child("DCPAudioChannels")->add_child_text (lexical_cast (_dcp_audio_channels)); + 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"); + root->add_child("Key")->add_child_text (_key.hex ()); _playlist->as_xml (root->add_child ("Playlist")); doc.write_to_file_formatted (file ("metadata.xml")); @@ -335,14 +360,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"); @@ -366,10 +391,14 @@ Film::read_metadata () _with_subtitles = f.bool_child ("WithSubtitles"); _j2k_bandwidth = f.number_child ("J2KBandwidth"); _dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); - _dcp_video_frame_rate = f.number_child ("DCPVideoFrameRate"); + _video_frame_rate = f.number_child ("VideoFrameRate"); _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); - _dcp_audio_channels = f.number_child ("DCPAudioChannels"); - + _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")); _dirty = false; @@ -381,8 +410,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; @@ -393,14 +420,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; @@ -432,6 +456,15 @@ 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 ()) { + d << "-3D"; + } + + if (video_frame_rate() != 24) { + d << "-" << video_frame_rate(); } if (container()) { @@ -456,7 +489,7 @@ Film::dci_name (bool if_created_now) const } } - switch (dcp_audio_channels ()) { + switch (audio_channels ()) { case 1: d << "_10"; break; @@ -513,9 +546,8 @@ Film::dcp_name (bool if_created_now) const void -Film::set_directory (string d) +Film::set_directory (boost::filesystem::path d) { - boost::mutex::scoped_lock lm (_state_mutex); _directory = d; _dirty = true; } @@ -523,126 +555,105 @@ 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_dcp_video_frame_rate (int f) +Film::set_video_frame_rate (int f) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _dcp_video_frame_rate = f; - } - signal_changed (DCP_VIDEO_FRAME_RATE); + _video_frame_rate = f; + signal_changed (VIDEO_FRAME_RATE); } void -Film::set_dcp_audio_channels (int c) +Film::set_audio_channels (int c) { - { - boost::mutex::scoped_lock lm (_state_mutex); - _dcp_audio_channels = c; - } - signal_changed (DCP_AUDIO_CHANNELS); + _audio_channels = c; + signal_changed (AUDIO_CHANNELS); +} + +void +Film::set_three_d (bool 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: - set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ()); + set_video_frame_rate (_playlist->best_dcp_frame_rate ()); break; - case Film::DCP_VIDEO_FRAME_RATE: + case Film::VIDEO_FRAME_RATE: + case Film::SEQUENCE_VIDEO: _playlist->maybe_sequence_video (); break; default: @@ -661,15 +672,23 @@ Film::set_dci_date_today () } string -Film::info_path (int f) const +Film::info_path (int f, Eyes e) const { boost::filesystem::path p; p /= info_dir (); stringstream s; s.width (8); - s << setfill('0') << f << ".md5"; + s << setfill('0') << f; + + if (e == EYES_LEFT) { + s << ".L"; + } else if (e == EYES_RIGHT) { + s << ".R"; + } + s << ".md5"; + p /= s.str(); /* info_dir() will already have added any initial bit of the path, @@ -679,7 +698,7 @@ Film::info_path (int f) const } string -Film::j2c_path (int f, bool t) const +Film::j2c_path (int f, Eyes e, bool t) const { boost::filesystem::path p; p /= "j2c"; @@ -687,7 +706,15 @@ Film::j2c_path (int f, bool t) const stringstream s; s.width (8); - s << setfill('0') << f << ".j2c"; + s << setfill('0') << f; + + if (e == EYES_LEFT) { + s << ".L"; + } else if (e == EYES_RIGHT) { + s << ".R"; + } + + s << ".j2c"; if (t) { s << ".tmp"; @@ -697,22 +724,30 @@ Film::j2c_path (int f, bool t) const return file (p.string ()); } -/** 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 @@ -721,14 +756,20 @@ 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; } -Playlist::ContentList +ContentList Film::content () const { return _playlist->content (); @@ -738,13 +779,18 @@ void Film::examine_and_add_content (shared_ptr c) { shared_ptr j (new ExamineContentJob (shared_from_this(), c)); - j->Finished.connect (bind (&Film::add_content_weak, this, boost::weak_ptr (c))); + j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr (j), boost::weak_ptr (c))); JobManager::instance()->add (j); } void -Film::add_content_weak (weak_ptr c) +Film::maybe_add_content (weak_ptr j, weak_ptr c) { + shared_ptr job = j.lock (); + if (!job || !job->finished_ok ()) { + return; + } + shared_ptr content = c.lock (); if (content) { add_content (content); @@ -756,7 +802,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); @@ -768,6 +814,18 @@ Film::remove_content (shared_ptr c) _playlist->remove (c); } +void +Film::move_content_earlier (shared_ptr c) +{ + _playlist->move_earlier (c); +} + +void +Film::move_content_later (shared_ptr c) +{ + _playlist->move_later (c); +} + Time Film::length () const { @@ -781,7 +839,7 @@ Film::has_subtitles () const } OutputVideoFrame -Film::best_dcp_video_frame_rate () const +Film::best_video_frame_rate () const { return _playlist->best_dcp_frame_rate (); } @@ -790,7 +848,7 @@ void Film::playlist_content_changed (boost::weak_ptr c, int p) { if (p == VideoContentProperty::VIDEO_FRAME_RATE) { - set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ()); + set_video_frame_rate (_playlist->best_dcp_frame_rate ()); } if (ui_signaller) { @@ -804,44 +862,32 @@ Film::playlist_changed () signal_changed (CONTENT); } -int -Film::loop () const -{ - return _playlist->loop (); -} - -void -Film::set_loop (int c) -{ - _playlist->set_loop (c); -} - OutputAudioFrame Film::time_to_audio_frames (Time t) const { - return t * dcp_audio_frame_rate () / TIME_HZ; + return t * audio_frame_rate () / TIME_HZ; } OutputVideoFrame Film::time_to_video_frames (Time t) const { - return t * dcp_video_frame_rate () / TIME_HZ; + return t * video_frame_rate () / TIME_HZ; } Time Film::audio_frames_to_time (OutputAudioFrame f) const { - return f * TIME_HZ / dcp_audio_frame_rate (); + return f * TIME_HZ / audio_frame_rate (); } Time Film::video_frames_to_time (OutputVideoFrame f) const { - return f * TIME_HZ / dcp_video_frame_rate (); + return f * TIME_HZ / video_frame_rate (); } OutputAudioFrame -Film::dcp_audio_frame_rate () const +Film::audio_frame_rate () const { /* XXX */ return 48000; @@ -850,7 +896,9 @@ Film::dcp_audio_frame_rate () const void Film::set_sequence_video (bool s) { + _sequence_video = s; _playlist->set_sequence_video (s); + signal_changed (SEQUENCE_VIDEO); } libdcp::Size @@ -866,3 +914,47 @@ Film::full_frame () const assert (false); return libdcp::Size (); } + +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 (); + + libdcp::DCP dcp (dir (dcp_dir.string ())); + + try { + dcp.read (); + } catch (...) { + 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); +} + +list +Film::make_kdms ( + list > screens, + boost::filesystem::path dcp, + boost::posix_time::ptime from, + boost::posix_time::ptime until + ) const +{ + list kdms; + + for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { + kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until)); + } + + return kdms; +}