X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=49ab944be54c79c3d478469ad09762a9555768fe;hp=c1812b9fd1dcb5fa014d84187237aa2d127f6228;hb=33e13c4053138930f4b2f59349e441c76111059d;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb diff --git a/src/lib/content.cc b/src/lib/content.cc index c1812b9fd..49ab944be 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,14 @@ */ + /** @file src/lib/content.cc * @brief Content class. */ + #include "content.h" +#include "change_signaller.h" #include "util.h" #include "content_factory.h" #include "video_content.h" @@ -41,16 +44,20 @@ #include "i18n.h" -using std::string; -using std::list; + using std::cout; -using std::vector; +using std::list; +using std::make_shared; using std::max; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; -using dcp::raw_convert; using dcp::locale_convert; +using dcp::raw_convert; +using namespace dcpomatic; + int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -59,43 +66,42 @@ int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; int const ContentProperty::VIDEO_FRAME_RATE = 405; -Content::Content (shared_ptr film) - : _film (film) - , _position (0) - , _trim_start (0) - , _trim_end (0) - , _change_signals_frequent (false) + +Content::Content () + : _change_signals_frequent (false) { } -Content::Content (shared_ptr film, DCPTime p) - : _film (film) - , _position (p) - , _trim_start (0) - , _trim_end (0) + +Content::Content (DCPTime p) + : _position (p) , _change_signals_frequent (false) { } -Content::Content (shared_ptr film, boost::filesystem::path p) - : _film (film) - , _position (0) - , _trim_start (0) - , _trim_end (0) - , _change_signals_frequent (false) + +Content::Content (boost::filesystem::path p) + : _change_signals_frequent (false) { - _paths.push_back (p); + add_path (p); } -Content::Content (shared_ptr film, cxml::ConstNodePtr node) - : _film (film) - , _change_signals_frequent (false) + +Content::Content (cxml::ConstNodePtr node) + : _change_signals_frequent (false) { - list path_children = node->node_children ("Path"); - for (list::const_iterator i = path_children.begin(); i != path_children.end(); ++i) { - _paths.push_back ((*i)->content ()); + for (auto i: node->node_children("Path")) { + _paths.push_back (i->content()); + auto const mod = i->optional_number_attribute("mtime"); + if (mod) { + _last_write_times.push_back (*mod); + } else { + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i->content(), ec); + _last_write_times.push_back (ec ? 0 : last_write); + } } _digest = node->optional_string_child ("Digest").get_value_or ("X"); _position = DCPTime (node->number_child ("Position")); @@ -104,11 +110,11 @@ Content::Content (shared_ptr film, cxml::ConstNodePtr node) _video_frame_rate = node->optional_number_child ("VideoFrameRate"); } -Content::Content (shared_ptr film, vector > c) - : _film (film) - , _position (c.front()->position ()) - , _trim_start (c.front()->trim_start ()) - , _trim_end (c.back()->trim_end ()) + +Content::Content (vector> c) + : _position (c.front()->position()) + , _trim_start (c.front()->trim_start()) + , _trim_end (c.back()->trim_end()) , _video_frame_rate (c.front()->video_frame_rate()) , _change_signals_frequent (false) { @@ -133,139 +139,190 @@ Content::Content (shared_ptr film, vector > c) } for (size_t j = 0; j < c[i]->number_of_paths(); ++j) { - _paths.push_back (c[i]->path (j)); + _paths.push_back (c[i]->path(j)); + _last_write_times.push_back (c[i]->_last_write_times[j]); } } } + void Content::as_xml (xmlpp::Node* node, bool with_paths) const { boost::mutex::scoped_lock lm (_mutex); if (with_paths) { - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - node->add_child("Path")->add_child_text (i->string ()); + for (size_t i = 0; i < _paths.size(); ++i) { + auto p = node->add_child("Path"); + p->add_child_text (_paths[i].string()); + p->set_attribute ("mtime", raw_convert(_last_write_times[i])); } } - node->add_child("Digest")->add_child_text (_digest); - node->add_child("Position")->add_child_text (raw_convert (_position.get ())); - node->add_child("TrimStart")->add_child_text (raw_convert (_trim_start.get ())); - node->add_child("TrimEnd")->add_child_text (raw_convert (_trim_end.get ())); + node->add_child("Digest")->add_child_text(_digest); + node->add_child("Position")->add_child_text(raw_convert(_position.get())); + node->add_child("TrimStart")->add_child_text(raw_convert(_trim_start.get())); + node->add_child("TrimEnd")->add_child_text(raw_convert(_trim_end.get())); if (_video_frame_rate) { - node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate.get())); + node->add_child("VideoFrameRate")->add_child_text(raw_convert(_video_frame_rate.get())); } } -void -Content::examine (shared_ptr job) -{ - if (job) { - job->sub (_("Computing digest")); - } +string +Content::calculate_digest () const +{ boost::mutex::scoped_lock lm (_mutex); - vector p = _paths; + auto p = _paths; lm.unlock (); /* Some content files are very big, so we use a poor man's digest here: a digest of the first and last 1e6 bytes with the size of the first file tacked on the end as a string. */ - string const d = digest_head_tail (p, 1000000) + raw_convert (boost::filesystem::file_size (p.front ())); + return digest_head_tail(p, 1000000) + raw_convert(boost::filesystem::file_size(p.front())); +} + + +void +Content::examine (shared_ptr, shared_ptr job) +{ + if (job) { + job->sub (_("Computing digest")); + } - lm.lock (); + auto const d = calculate_digest (); + + boost::mutex::scoped_lock lm (_mutex); _digest = d; + + _last_write_times.clear (); + for (auto i: _paths) { + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i, ec); + _last_write_times.push_back (ec ? 0 : last_write); + } } + void -Content::signal_changed (int p) +Content::signal_change (ChangeType c, int p) { try { - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); - } catch (boost::bad_weak_ptr) { + if (c == ChangeType::PENDING || c == ChangeType::CANCELLED) { + Change (c, shared_from_this(), p, _change_signals_frequent); + } else { + emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent)); + } + } catch (std::bad_weak_ptr &) { /* This must be during construction; never mind */ } } + void -Content::set_position (DCPTime p) +Content::set_position (shared_ptr film, DCPTime p, bool force_emit) { - /* video content can modify its position */ + /* video and audio content can modify its position */ + if (video) { - video->modify_position (p); + video->modify_position (film, p); + } + + /* Only allow the audio to modify if we have no video; + sometimes p can't be on an integer video AND audio frame, + and in these cases we want the video constraint to be + satisfied since (I think) the audio code is better able to + cope. + */ + if (!video && audio) { + audio->modify_position (film, p); } + ContentChangeSignaller cc (this, ContentProperty::POSITION); + { boost::mutex::scoped_lock lm (_mutex); - if (p == _position) { + if (p == _position && !force_emit) { + cc.abort (); return; } _position = p; } - - signal_changed (ContentProperty::POSITION); } + void Content::set_trim_start (ContentTime t) { - /* video content can modify its start trim */ + /* video and audio content can modify its start trim */ + if (video) { video->modify_trim_start (t); } + /* See note in ::set_position */ + if (!video && audio) { + audio->modify_trim_start (t); + } + + ContentChangeSignaller cc (this, ContentProperty::TRIM_START); + { boost::mutex::scoped_lock lm (_mutex); _trim_start = t; } - - signal_changed (ContentProperty::TRIM_START); } + void Content::set_trim_end (ContentTime t) { + ContentChangeSignaller cc (this, ContentProperty::TRIM_END); + { boost::mutex::scoped_lock lm (_mutex); _trim_end = t; } - - signal_changed (ContentProperty::TRIM_END); } shared_ptr Content::clone () const { - shared_ptr film = _film.lock (); - if (!film) { - return shared_ptr (); - } - /* This is a bit naughty, but I can't think of a compelling reason not to do it ... */ xmlpp::Document doc; - xmlpp::Node* node = doc.create_root_node ("Content"); + auto node = doc.create_root_node ("Content"); as_xml (node, true); /* notes is unused here (we assume) */ list notes; - return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version, notes); + return content_factory (make_shared(node), Film::current_state_version, notes); } + string Content::technical_summary () const { - return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + auto s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + if (_video_frame_rate) { + s += String::compose(" %1", *_video_frame_rate); + } + return s; } + DCPTime -Content::length_after_trim () const +Content::length_after_trim (shared_ptr film) const { - return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ()))); + auto length = max(DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position()))); + if (video) { + length = length.round(film->video_frame_rate()); + } + return length; } + /** @return string which changes when something about this content changes which affects * the appearance of its video. */ @@ -280,11 +337,12 @@ Content::identifier () const return buffer; } + bool Content::paths_valid () const { - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - if (!boost::filesystem::exists (*i)) { + for (auto i: _paths) { + if (!boost::filesystem::exists (i)) { return false; } } @@ -292,21 +350,25 @@ Content::paths_valid () const return true; } -void -Content::set_path (boost::filesystem::path path) -{ - _paths.clear (); - _paths.push_back (path); - signal_changed (ContentProperty::PATH); -} void Content::set_paths (vector paths) { - _paths = paths; - signal_changed (ContentProperty::PATH); + ContentChangeSignaller cc (this, ContentProperty::PATH); + + { + boost::mutex::scoped_lock lm (_mutex); + _paths = paths; + _last_write_times.clear (); + for (auto i: _paths) { + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i, ec); + _last_write_times.push_back (ec ? 0 : last_write); + } + } } + string Content::path_summary () const { @@ -314,7 +376,7 @@ Content::path_summary () const DCPOMATIC_ASSERT (number_of_paths ()); - string s = path(0).filename().string (); + auto s = path(0).filename().string(); if (number_of_paths() > 1) { s += " ..."; } @@ -322,26 +384,20 @@ Content::path_summary () const return s; } + /** @return a list of properties that might be interesting to the user */ list -Content::user_properties () const +Content::user_properties (shared_ptr film) const { list p; - add_properties (p); + add_properties (film, p); return p; } -shared_ptr -Content::film () const -{ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film; -} /** @return DCP times of points within this content where a reel split could occur */ list -Content::reel_split_points () const +Content::reel_split_points (shared_ptr) const { list t; /* This is only called for video content and such content has its position forced @@ -351,36 +407,41 @@ Content::reel_split_points () const return t; } + void Content::set_video_frame_rate (double r) { + ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + { boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate && fabs(r - *_video_frame_rate) < VIDEO_FRAME_RATE_EPSILON) { + cc.abort(); + } _video_frame_rate = r; } - signal_changed (ContentProperty::VIDEO_FRAME_RATE); - - /* Make sure things are still on frame boundaries */ + /* Make sure trim is still on a frame boundary */ if (video) { - set_position (position()); set_trim_start (trim_start()); } } + void Content::unset_video_frame_rate () { + ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + { boost::mutex::scoped_lock lm (_mutex); _video_frame_rate = optional(); } - - signal_changed (ContentProperty::VIDEO_FRAME_RATE); } + double -Content::active_video_frame_rate () const +Content::active_video_frame_rate (shared_ptr film) const { { boost::mutex::scoped_lock lm (_mutex); @@ -393,13 +454,12 @@ Content::active_video_frame_rate () const prepared for any concurrent video content or perhaps just the DCP rate. */ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); return film->active_frame_rate_change(position()).source; } + void -Content::add_properties (list& p) const +Content::add_properties (shared_ptr, list& p) const { p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); @@ -426,6 +486,7 @@ Content::add_properties (list& p) const } } + /** Take settings from the given content if it is of the correct type */ void Content::take_settings_from (shared_ptr c) @@ -437,8 +498,8 @@ Content::take_settings_from (shared_ptr c) audio->take_settings_from (c->audio); } - list >::iterator i = text.begin (); - list >::const_iterator j = c->text.begin (); + auto i = text.begin (); + auto j = c->text.begin (); while (i != text.end() && j != c->text.end()) { (*i)->take_settings_from (*j); ++i; @@ -446,24 +507,37 @@ Content::take_settings_from (shared_ptr c) } } + shared_ptr Content::only_text () const { DCPOMATIC_ASSERT (text.size() < 2); - if (text.empty ()) { - return shared_ptr (); + if (text.empty()) { + return {}; } return text.front (); } + shared_ptr Content::text_of_original_type (TextType type) const { - BOOST_FOREACH (shared_ptr i, text) { + for (auto i: text) { if (i->original_type() == type) { return i; } } - return shared_ptr (); + return {}; +} + + +void +Content::add_path (boost::filesystem::path p) +{ + boost::mutex::scoped_lock lm (_mutex); + _paths.push_back (p); + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(p, ec); + _last_write_times.push_back (ec ? 0 : last_write); }