X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=b64e68c4b1739e0dec621877349971815ff93f49;hb=a306df9145d16046e51e8b7ff5222e341e98fdbd;hp=8b611f6b63c0385794979b1d740a8c773d9d00f4;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 8b611f6b6..b64e68c4b 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -50,6 +51,7 @@ int const ContentProperty::POSITION = 401; int const ContentProperty::LENGTH = 402; 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) @@ -93,6 +95,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) @@ -100,6 +103,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) { @@ -111,6 +115,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)); } @@ -129,6 +144,9 @@ Content::as_xml (xmlpp::Node* node) const 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 @@ -143,10 +161,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; @@ -155,7 +173,11 @@ Content::examine (shared_ptr job) void Content::signal_changed (int p) { - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + try { + emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + } catch (boost::bad_weak_ptr) { + /* This must be during construction; never mind */ + } } void @@ -223,13 +245,11 @@ Content::technical_summary () const DCPTime Content::length_after_trim () const { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ()))); + return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ()))); } -/** @return string which includes everything about how this content affects - * its playlist. +/** @return string which changes when something about this content changes which affects + * the appearance of its video. */ string Content::identifier () const @@ -279,13 +299,73 @@ Content::path_summary () const return s; } -/** @return a list of properties that might be interesting to the user; first string is the property name, - * second is the value. - */ -list > -Content::properties () const +/** @return a list of properties that might be interesting to the user */ +list +Content::user_properties () const { - list > p; + list p; add_properties (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 +{ + 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())); + return t; +} + +void +Content::set_video_frame_rate (double r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = r; + } + + signal_changed (ContentProperty::VIDEO_FRAME_RATE); +} + +double +Content::active_video_frame_rate () const +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate) { + return _video_frame_rate.get (); + } + } + + /* No frame rate specified, so assume this content has been + 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 +{ + p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); + + if (_video_frame_rate) { + p.push_back ( + UserProperty ( + UserProperty::GENERAL, _("Video frame rate"), raw_convert (_video_frame_rate.get(), 5), _("frames per second") + ) + ); + } +}