X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=629672b7317d8e2252cab36f528f2e69b9329f57;hb=6199e090dc1e32d3753ba7e7d7ea8c5f0d79f046;hp=7afbf924f63912c5631caf1a8b138583ad3ca616;hpb=291e2fe2e7df95019feba8097b68b31ec64be794;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 7afbf924f..629672b73 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -25,12 +25,15 @@ #include "content.h" #include "util.h" #include "content_factory.h" +#include "video_content.h" +#include "audio_content.h" +#include "caption_content.h" #include "exceptions.h" #include "film.h" -#include "safe_stringstream.h" #include "job.h" #include "compose.hpp" -#include "raw_convert.h" +#include +#include #include #include #include @@ -45,6 +48,9 @@ using std::vector; using std::max; using std::pair; using boost::shared_ptr; +using boost::optional; +using dcp::raw_convert; +using dcp::locale_convert; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -95,6 +101,7 @@ Content::Content (shared_ptr film, cxml::ConstNodePtr node) _position = DCPTime (node->number_child ("Position")); _trim_start = ContentTime (node->number_child ("TrimStart")); _trim_end = ContentTime (node->number_child ("TrimEnd")); + _video_frame_rate = node->optional_number_child ("VideoFrameRate"); } Content::Content (shared_ptr film, vector > c) @@ -102,6 +109,7 @@ Content::Content (shared_ptr film, 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) { for (size_t i = 0; i < c.size(); ++i) { @@ -113,6 +121,17 @@ Content::Content (shared_ptr film, vector > c) throw JoinError (_("Only the last piece of content to be joined can have an end trim.")); } + if ( + (_video_frame_rate && !c[i]->_video_frame_rate) || + (!_video_frame_rate && c[i]->_video_frame_rate) + ) { + throw JoinError (_("Content to be joined must have the same video frame rate")); + } + + if (_video_frame_rate && fabs (_video_frame_rate.get() - c[i]->_video_frame_rate.get()) > VIDEO_FRAME_RATE_EPSILON) { + throw JoinError (_("Content to be joined must have the same video frame rate")); + } + for (size_t j = 0; j < c[i]->number_of_paths(); ++j) { _paths.push_back (c[i]->path (j)); } @@ -120,17 +139,22 @@ Content::Content (shared_ptr film, vector > c) } void -Content::as_xml (xmlpp::Node* node) const +Content::as_xml (xmlpp::Node* node, bool with_paths) const { boost::mutex::scoped_lock lm (_mutex); - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - node->add_child("Path")->add_child_text (i->string ()); + if (with_paths) { + for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { + node->add_child("Path")->add_child_text (i->string ()); + } } 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())); + } } void @@ -145,10 +169,10 @@ Content::examine (shared_ptr job) lm.unlock (); /* Some content files are very big, so we use a poor man's - digest here: a MD5 of the first and last 1e6 bytes with the + 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 = md5_digest_head_tail (p, 1000000) + raw_convert (boost::filesystem::file_size (p.front ())); + string const d = digest_head_tail (p, 1000000) + raw_convert (boost::filesystem::file_size (p.front ())); lm.lock (); _digest = d; @@ -167,6 +191,11 @@ Content::signal_changed (int p) void Content::set_position (DCPTime p) { + /* video content can modify its position */ + if (video) { + video->modify_position (p); + } + { boost::mutex::scoped_lock lm (_mutex); if (p == _position) { @@ -182,6 +211,11 @@ Content::set_position (DCPTime p) void Content::set_trim_start (ContentTime t) { + /* video content can modify its start trim */ + if (video) { + video->modify_trim_start (t); + } + { boost::mutex::scoped_lock lm (_mutex); _trim_start = t; @@ -213,7 +247,7 @@ Content::clone () const /* 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"); - as_xml (node); + as_xml (node, true); /* notes is unused here (we assume) */ list notes; @@ -238,14 +272,12 @@ Content::length_after_trim () const string Content::identifier () const { - SafeStringStream s; - - s << Content::digest() - << "_" << position().get() - << "_" << trim_start().get() - << "_" << trim_end().get(); - - return s.str (); + char buffer[256]; + snprintf ( + buffer, sizeof(buffer), "%s_%" PRId64 "_%" PRId64 "_%" PRId64, + Content::digest().c_str(), position().get(), trim_start().get(), trim_end().get() + ); + return buffer; } bool @@ -268,6 +300,13 @@ Content::set_path (boost::filesystem::path path) signal_changed (ContentProperty::PATH); } +void +Content::set_paths (vector paths) +{ + _paths = paths; + signal_changed (ContentProperty::PATH); +} + string Content::path_summary () const { @@ -305,8 +344,10 @@ list Content::reel_split_points () const { list t; - /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */ - t.push_back (position().round_up (film()->video_frame_rate())); + /* This is only called for video content and such content has its position forced + to start on a frame boundary. + */ + t.push_back (position()); return t; } @@ -319,6 +360,23 @@ Content::set_video_frame_rate (double r) } signal_changed (ContentProperty::VIDEO_FRAME_RATE); + + /* Make sure things are still on frame boundaries */ + if (video) { + set_position (position()); + set_trim_start (trim_start()); + } +} + +void +Content::unset_video_frame_rate () +{ + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = optional(); + } + + signal_changed (ContentProperty::VIDEO_FRAME_RATE); } double @@ -343,9 +401,69 @@ Content::active_video_frame_rate () const void Content::add_properties (list& p) const { - p.push_back (UserProperty (_("General"), _("Filename"), path(0).string ())); + p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); if (_video_frame_rate) { - p.push_back (UserProperty (_("General"), _("Video frame rate"), raw_convert (_video_frame_rate.get(), 5), _("frames per second"))); + if (video) { + p.push_back ( + UserProperty ( + UserProperty::VIDEO, + _("Frame rate"), + locale_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } else { + p.push_back ( + UserProperty ( + UserProperty::GENERAL, + _("Prepared for video frame rate"), + locale_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } + } +} + +/** Take settings from the given content if it is of the correct type */ +void +Content::take_settings_from (shared_ptr c) +{ + if (video && c->video) { + video->take_settings_from (c->video); } + if (audio && c->audio) { + audio->take_settings_from (c->audio); + } + + list >::iterator i = caption.begin (); + list >::const_iterator j = c->caption.begin (); + while (i != caption.end() && j != c->caption.end()) { + (*i)->take_settings_from (*j); + ++i; + ++j; + } +} + +shared_ptr +Content::only_caption () const +{ + DCPOMATIC_ASSERT (caption.size() < 2); + if (caption.empty ()) { + return shared_ptr (); + } + return caption.front (); +} + +shared_ptr +Content::caption_of_original_type (CaptionType type) const +{ + BOOST_FOREACH (shared_ptr i, caption) { + if (i->original_type() == type) { + return i; + } + } + + return shared_ptr (); }