X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp_time.cc;h=7425df2c713a2fabe130c0bc1dca4cc9aa2bc8a6;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=15ad05d430d84da9f4282c0617100a5cec70a0f5;hpb=41daa5821b3d3b0f450094fbf0d1e37a449f482c;p=libdcp.git diff --git a/src/dcp_time.cc b/src/dcp_time.cc index 15ad05d4..7425df2c 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -1,109 +1,138 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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, + libdcp 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 libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/dcp_time.cc - * @brief A representation of time within a DCP. + * @brief Time class. */ +#include "raw_convert.h" +#include "dcp_time.h" +#include "exceptions.h" +#include #include #include -#include -#include #include -#include "dcp_time.h" -#include "exceptions.h" using namespace std; using namespace boost; -using namespace libdcp; +using namespace dcp; -Time::Time (int frame, int frames_per_second) - : h (0) - , m (0) - , s (0) - , t (0) +Time::Time (int frame, double frames_per_second, int tcr_) { - float sec_float = float (frame) / frames_per_second; - t = (int (floor (sec_float * 1000)) % 1000) / 4; - s = floor (sec_float); + set (double (frame) / frames_per_second, tcr_); +} - if (s > 60) { +/** Construct a Time from a number of seconds and a timecode rate. + * + * @param seconds A number of seconds. + * @param tcr_ Timecode rate. + */ +Time::Time (double seconds, int tcr_) +{ + set (seconds, tcr_); +} + +/** Construct a Time with specified timecode rate and using the supplied + * number of seconds. + * + * @param seconds A number of seconds. + * @param tcr_ Timecode rate to use. + */ +void +Time::set (double seconds, int tcr_) +{ + s = floor (seconds); + tcr = tcr_; + + e = int (round ((seconds - s) * tcr)); + + if (s >= 60) { m = s / 60; s -= m * 60; + } else { + m = 0; } - if (m > 60) { + if (m >= 60) { h = m / 60; m -= h * 60; + } else { + h = 0; } } -Time::Time (string time) +/** @param time String of the form HH:MM:SS:EE[E] */ +Time::Time (string time, int tcr_) + : tcr (tcr_) { vector b; split (b, time, is_any_of (":")); if (b.size() != 4) { - throw DCPReadError ("unrecognised time specification"); + boost::throw_exception (DCPReadError ("unrecognised time specification")); } - - h = lexical_cast (b[0]); - m = lexical_cast (b[1]); - s = lexical_cast (b[2]); - t = lexical_cast (b[3]); + + h = raw_convert (b[0]); + m = raw_convert (b[1]); + s = raw_convert (b[2]); + e = raw_convert (b[3]); } bool -libdcp::operator== (Time const & a, Time const & b) +dcp::operator== (Time const & a, Time const & b) { - return (a.h == b.h && a.m == b.m && a.s == b.s && a.t == b.t); + return (a.h == b.h && a.m == b.m && a.s == b.s && (a.e * b.tcr) == (b.e * a.tcr)); } bool -libdcp::operator!= (Time const & a, Time const & b) +dcp::operator!= (Time const & a, Time const & b) { return !(a == b); } bool -libdcp::operator<= (Time const & a, Time const & b) +dcp::operator<= (Time const & a, Time const & b) { - if (a.h != b.h) { - return a.h <= b.h; - } - - if (a.m != b.m) { - return a.m <= b.m; - } - - if (a.s != b.s) { - return a.s <= b.s; - } - - if (a.t != b.t) { - return a.t <= b.t; - } + return a < b || a == b; +} - return true; +bool +dcp::operator>= (Time const & a, Time const & b) +{ + return a > b || a == b; } bool -libdcp::operator< (Time const & a, Time const & b) +dcp::operator< (Time const & a, Time const & b) { if (a.h != b.h) { return a.h < b.h; @@ -117,15 +146,15 @@ libdcp::operator< (Time const & a, Time const & b) return a.s < b.s; } - if (a.t != b.t) { - return a.t < b.t; + if ((a.e * b.tcr) != (b.e * a.tcr)) { + return (a.e * b.tcr) < (b.e * a.tcr); } return true; } bool -libdcp::operator> (Time const & a, Time const & b) +dcp::operator> (Time const & a, Time const & b) { if (a.h != b.h) { return a.h > b.h; @@ -139,28 +168,37 @@ libdcp::operator> (Time const & a, Time const & b) return a.s > b.s; } - if (a.t != b.t) { - return a.t > b.t; + if ((a.e * b.tcr) != (b.e * a.tcr)) { + return (a.e * b.tcr) > (b.e * a.tcr); } return true; } ostream & -libdcp::operator<< (ostream& s, Time const & t) +dcp::operator<< (ostream& s, Time const & t) { - s << t.h << ":" << t.m << ":" << t.s << "." << t.t; + s << t.h << ":" << t.m << ":" << t.s << "." << t.e; return s; } -libdcp::Time -libdcp::operator+ (Time a, Time const & b) +dcp::Time +dcp::operator+ (Time a, Time b) { Time r; - r.t = a.t + b.t; - if (r.t >= 250) { - r.t -= 250; + /* Make sure we have a common tcr */ + if (a.tcr != b.tcr) { + a.e *= b.tcr; + b.e *= a.tcr; + r.tcr = a.tcr * b.tcr; + } else { + r.tcr = a.tcr; + } + + r.e = a.e + b.e; + if (r.e >= r.tcr) { + r.e -= r.tcr; r.s++; } @@ -181,14 +219,23 @@ libdcp::operator+ (Time a, Time const & b) return r; } -libdcp::Time -libdcp::operator- (Time a, Time const & b) +dcp::Time +dcp::operator- (Time a, Time b) { Time r; - r.t = a.t - b.t; - if (r.t < 0) { - r.t += 250; + /* Make sure we have a common tcr */ + if (a.tcr != b.tcr) { + a.e *= b.tcr; + b.e *= a.tcr; + r.tcr = a.tcr * b.tcr; + } else { + r.tcr = a.tcr; + } + + r.e = a.e - b.e; + if (r.e < 0) { + r.e += r.tcr; r.s--; } @@ -210,26 +257,53 @@ libdcp::operator- (Time a, Time const & b) } float -libdcp::operator/ (Time a, Time const & b) +dcp::operator/ (Time a, Time const & b) { - int64_t const at = a.h * 3600 * 250 + a.m * 60 * 250 + a.s * 250 + a.t; - int64_t const bt = b.h * 3600 * 250 + b.m * 60 * 250 + b.s * 250 + b.t; + int64_t const at = a.h * 3600 + a.m * 60 + a.s * float (a.e) / a.tcr; + int64_t const bt = b.h * 3600 + b.m * 60 + b.s * float (b.e) / b.tcr; return float (at) / bt; } -/** @return A string of the form h:m:s:t */ +/** @return A string of the form h:m:s:e padded as in 00:00:00:000 (for Interop) or 00:00:00:00 (for SMPTE) */ string -Time::to_string () const +Time::as_string (Standard standard) const { stringstream str; - str << h << ":" << m << ":" << s << ":" << t; + str << setw(2) << setfill('0') << h << ":" + << setw(2) << setfill('0') << m << ":" + << setw(2) << setfill('0') << s << ":"; + + if (standard == SMPTE) { + str << setw(2) << setfill('0') << e; + } else { + str << setw(3) << setfill('0') << e; + } + return str.str (); } -/** @return This time in ticks */ +/** @param tcr_ Timecode rate with which the return value should be counted. + * @return the total number of editable units that this time consists of at the specified timecode rate, rounded up + * to the nearest editable unit. For example, as_editable_units (24) returns the total time in frames at 24fps. + */ int64_t -Time::to_ticks () const +Time::as_editable_units (int tcr_) const { - return t + s * 25 + m * 60 * 25 + h * 60 * 60 * 25; + return ceil (int64_t(e) * double (tcr_) / tcr) + int64_t(s) * tcr_ + int64_t(m) * 60 * tcr_ + int64_t(h) * 60 * 60 * tcr_; } +/** @return the total number of seconds that this time consists of */ +double +Time::as_seconds () const +{ + return h * 3600 + m * 60 + s + double(e) / tcr; +} + +/** @param tcr_ New timecode rate. + * @return A new Time which is this time at the spcified new timecode rate. + */ +Time +Time::rebase (int tcr_) const +{ + return Time (h, m, s, floor (float (e) * tcr_ / tcr), tcr_); +}