Express trims using ContentTime so that they do not change

when DCP frame rate is changed (#637).

diff --git a/ChangeLog b/ChangeLog
index 9d652be4928c8d95376c46ac43b52c5f33387d12..66d20b4b6004ae72ddff7f10a324ca951c133825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-14  c.hetherington  <cth@carlh.net>
+
+       * Fix trim point movement when changing DCP frame rate (#637).
+
 2015-07-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.1.21 released.

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 2b4f02b903c90d8027d48c1f0fe1fbb36ac49380..65c005157846338dbb8f07889cc74885a30a6030 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -88,9 +88,9 @@ Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
                _paths.push_back ((*i)->content ());
        }
        _digest = node->optional_string_child ("Digest").get_value_or ("X");
-       _position = DCPTime (node->number_child<double> ("Position"));
-       _trim_start = DCPTime (node->number_child<double> ("TrimStart"));
-       _trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
+       _position = DCPTime (node->number_child<DCPTime::Type> ("Position"));
+       _trim_start = ContentTime (node->number_child<ContentTime::Type> ("TrimStart"));
+       _trim_end = ContentTime (node->number_child<ContentTime::Type> ("TrimEnd"));
 }
 
 Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
@@ -101,11 +101,11 @@ Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
        , _change_signals_frequent (false)
 {
        for (size_t i = 0; i < c.size(); ++i) {
-               if (i > 0 && c[i]->trim_start() > DCPTime()) {
+               if (i > 0 && c[i]->trim_start() > ContentTime ()) {
                        throw JoinError (_("Only the first piece of content to be joined can have a start trim."));
                }
 
-               if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) {
+               if (i < (c.size() - 1) && c[i]->trim_end () > ContentTime ()) {
                        throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
                }
 
@@ -172,7 +172,7 @@ Content::set_position (DCPTime p)
 }
 
 void
-Content::set_trim_start (DCPTime t)
+Content::set_trim_start (ContentTime t)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -183,7 +183,7 @@ Content::set_trim_start (DCPTime t)
 }
 
 void
-Content::set_trim_end (DCPTime t)
+Content::set_trim_end (ContentTime t)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -221,7 +221,9 @@ Content::technical_summary () const
 DCPTime
 Content::length_after_trim () const
 {
-       return max (DCPTime (), full_length() - trim_start() - trim_end());
+       shared_ptr<const Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       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

diff --git a/src/lib/content.h b/src/lib/content.h
index 2deee9763b70f3bc9c37edd901fcb93858de02c3..b7f7987ef4fa0d79783df8a56d869f52fedfabf8 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -128,16 +128,16 @@ public:
                return _position;
        }
 
-       void set_trim_start (DCPTime);
+       void set_trim_start (ContentTime);
 
-       DCPTime trim_start () const {
+       ContentTime trim_start () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_start;
        }
 
-       void set_trim_end (DCPTime);
+       void set_trim_end (ContentTime);
 
-       DCPTime trim_end () const {
+       ContentTime trim_end () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_end;
        }
@@ -176,8 +176,8 @@ protected:
 private:
        std::string _digest;
        DCPTime _position;
-       DCPTime _trim_start;
-       DCPTime _trim_end;
+       ContentTime _trim_start;
+       ContentTime _trim_end;
        bool _change_signals_frequent;
 };
 

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 4541ced7dc504db73621e9db29e23bbe4b2750d5..3d4ed11398d67d5f4c034c18406561f75fa694d5 100644 (file)
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -45,6 +45,36 @@ min (DCPTime a, DCPTime b)
        return b;
 }
 
+DCPTime
+max (DCPTime a, DCPTime b)
+{
+       if (a > b) {
+               return a;
+       }
+
+       return b;
+}
+
+ContentTime
+min (ContentTime a, ContentTime b)
+{
+       if (a < b) {
+               return a;
+       }
+
+       return b;
+}
+
+ContentTime
+max (ContentTime a, ContentTime b)
+{
+       if (a > b) {
+               return a;
+       }
+
+       return b;
+}
+
 ostream &
 operator<< (ostream& s, ContentTime t)
 {

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 6988159570c2680468eb016905c76cfccfc3494b..437b78f627bc7e51f5c59701f3fe7a59b3528924 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -241,6 +241,9 @@ public:
 };
 
 DCPTime min (DCPTime a, DCPTime b);
+DCPTime max (DCPTime a, DCPTime b);
+ContentTime min (ContentTime a, ContentTime b);
+ContentTime max (ContentTime a, ContentTime b);
 std::ostream& operator<< (std::ostream& s, ContentTime t);
 std::ostream& operator<< (std::ostream& s, DCPTime t);
 

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c551c988603e4f015324f3ed5c44cca038d6dcd6..a289c3d9258db74e584d181eab3e00336fe94d5e 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -522,48 +522,33 @@ Frame
 Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
        shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
-
-       DCPTime s = t - piece->content->position () + piece->content->trim_start ();
-       s = DCPTime (max (DCPTime::Type (0), s.get ()));
-       s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
-       return ContentTime (s, piece->frc).frames (vc->video_frame_rate ());
+       DCPTime s = t - piece->content->position ();
+       s = min (piece->content->length_after_trim(), s);
+       return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames (vc->video_frame_rate ());
 }
 
 DCPTime
 Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
        shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
-
-       ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ());
-       DCPTime t = DCPTime (c, piece->frc) - piece->content->trim_start () + piece->content->position ();
-
-       if (t < DCPTime ()) {
-               t = DCPTime ();
-       }
-
-       return t;
+       ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ()) - piece->content->trim_start ();
+       return max (DCPTime (), DCPTime (c, piece->frc) + piece->content->position ());
 }
 
 Frame
 Player::dcp_to_content_audio (shared_ptr<const Piece> piece, AudioStreamPtr stream, DCPTime t) const
 {
-       DCPTime s = t - piece->content->position () + piece->content->trim_start ();
-       s = DCPTime (max (DCPTime::Type (0), s.get ()));
-       s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
-       return ContentTime (s, piece->frc).frames (stream->frame_rate ());
+       DCPTime s = t - piece->content->position ();
+       s = min (piece->content->length_after_trim(), s);
+       return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames (stream->frame_rate ());
 }
 
 ContentTime
 Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
 {
-       /* s is the offset of t from the start position of this content */
        DCPTime s = t - piece->content->position ();
-       s = DCPTime (max (DCPTime::Type (0), s.get ()));
-       s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
-       return ContentTime (s + piece->content->trim_start(), piece->frc);
+       s = min (piece->content->length_after_trim(), s);
+       return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
 }
 
 void

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e2135a60ed6a9479450f0991430aab819fc16ec6..4e46fdbdffb885778b99e373cd5d38a679c81e73 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -303,13 +303,16 @@ Playlist::video_end () const
 FrameRateChange
 Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
 {
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+       for (ContentList::const_reverse_iterator i = _content.rbegin(); i != _content.rend(); ++i) {
                shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
                if (!vc) {
                        continue;
                }
 
-               if (vc->position() >= t && t < vc->end()) {
+               if (vc->position() <= t) {
+                       /* This is the first piece of content (going backwards...) that starts before t,
+                          so it's the active one.
+                       */
                        return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
                }
        }

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 4baafe9db8faff4070a81a74fed302d48706eff4..8ce64777bc9441fcad37830b67bba8087281c34b 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -83,13 +83,13 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
        _full_length = new Timecode<DCPTime> (this);
        grid->Add (_full_length);
        add_label_to_sizer (grid, this, _("Trim from start"), true);
-       _trim_start = new Timecode<DCPTime> (this);
+       _trim_start = new Timecode<ContentTime> (this);
        grid->Add (_trim_start);
        _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position"));
        grid->AddSpacer (0);
        grid->Add (_trim_start_to_playhead);
        add_label_to_sizer (grid, this, _("Trim from end"), true);
-       _trim_end = new Timecode<DCPTime> (this);
+       _trim_end = new Timecode<ContentTime> (this);
        grid->Add (_trim_end);
        _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position"));
        grid->AddSpacer (0);
@@ -211,7 +211,7 @@ TimingPanel::film_content_changed (int property)
 
        } else if (property == ContentProperty::TRIM_START) {
 
-               set<DCPTime> check;
+               set<ContentTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->trim_start ());
                }
@@ -224,7 +224,7 @@ TimingPanel::film_content_changed (int property)
 
        } else if (property == ContentProperty::TRIM_END) {
 
-               set<DCPTime> check;
+               set<ContentTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->trim_end ());
                }
@@ -325,7 +325,11 @@ TimingPanel::play_length_changed ()
 {
        ContentList c = _parent->selected ();
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_trim_end ((*i)->full_length() - _play_length->get (_parent->film()->video_frame_rate()) - (*i)->trim_start());
+               FrameRateChange const frc = _parent->film()->active_frame_rate_change ((*i)->position ());
+               (*i)->set_trim_end (
+                       ContentTime ((*i)->full_length() - _play_length->get (_parent->film()->video_frame_rate()), frc)
+                       - (*i)->trim_start ()
+                       );
        }
 }
 
@@ -382,7 +386,8 @@ TimingPanel::trim_start_to_playhead_clicked ()
        DCPTime const ph = _viewer->position ();
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                if (i->position() < ph && ph < i->end ()) {
-                       i->set_trim_start (i->trim_start() + ph - i->position ());
+                       FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
+                       i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
                }
        }
 }
@@ -393,7 +398,8 @@ TimingPanel::trim_end_to_playhead_clicked ()
        DCPTime const ph = _viewer->position ();
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                if (i->position() < ph && ph < i->end ()) {
-                       i->set_trim_end (i->position() + i->full_length() - i->trim_start() - ph);
+                       FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
+                       i->set_trim_end (ContentTime (i->position() + i->full_length() - ph, frc) - i->trim_start());
                }
 
        }

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 100945731a2c6cef2109bd87299053d56ac8b1f4..d1f5ea5495a3b902aa92a6fee5b7be7c81eed9ee 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -48,10 +48,10 @@ private:
 
        Timecode<DCPTime>* _position;
        Timecode<DCPTime>* _full_length;
-       Timecode<DCPTime>* _trim_start;
+       Timecode<ContentTime>* _trim_start;
        wxButton* _trim_start_to_playhead;
        wxButton* _trim_end_to_playhead;
-       Timecode<DCPTime>* _trim_end;
+       Timecode<ContentTime>* _trim_end;
        Timecode<DCPTime>* _play_length;
        wxTextCtrl* _video_frame_rate;
        wxButton* _set_video_frame_rate;

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 92e7b15ec5420cef180905060c7732df7f55e675..6598e46336d7ac0dca3b90890890a9e8c9749b72 100644 (file)
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, no trim, content rate = DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, 1.5s trim, content rate = DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
           fast (at 25fps) in this case, this means 75 frames of content video will be used.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, no trim, content rate 24, DCP rate 25 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
@@ -226,9 +226,11 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  40);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 169);
 
-       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25 */
+       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25.  Here the trim is in ContentTime,
+          so it's 1.6s at 24fps.
+        */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.6));
+       content->set_trim_start (ContentTime::from_seconds (1.6));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
@@ -236,9 +238,9 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)),   0);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),  40);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  80);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 209);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),  38);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  78);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 207);
 
        /* Position 0, no trim, content rate 24, DCP rate 48
           Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -247,7 +249,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
           content rate = DCP rate case.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -259,7 +261,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -273,7 +275,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -291,7 +293,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
           be used to make 3 * 24 frames of DCP video.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -303,7 +305,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -317,7 +319,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -347,7 +349,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -359,7 +361,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, no trim, content rate = DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -371,7 +373,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, 1.5s trim, content rate = DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -387,7 +389,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
           fast (at 25fps) in this case, this means 75 frames of content video will be used.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
@@ -399,7 +401,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, no trim, content rate 24, DCP rate 25 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
@@ -409,18 +411,18 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 40), DCPTime::from_seconds (4.60));
        BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 169), DCPTime::from_seconds (9.76));
 
-       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25 */
+       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.6));
+       content->set_trim_start (ContentTime::from_seconds (1.6));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
        BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
        piece = player->_pieces.front ();
-       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.4));
-       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 40), DCPTime::from_seconds (3.00));
-       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 80), DCPTime::from_seconds (4.60));
-       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 209), DCPTime::from_seconds (9.76));
+       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0), DCPTime::from_seconds (1.464));
+       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 40), DCPTime::from_seconds (3.064));
+       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 80), DCPTime::from_seconds (4.664));
+       BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 209), DCPTime::from_seconds (9.824));
 
        /* Position 0, no trim, content rate 24, DCP rate 48
           Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -429,7 +431,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
           content rate = DCP rate case.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -441,7 +443,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -453,7 +455,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
@@ -470,7 +472,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
           be used to make 3 * 24 frames of DCP video.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -482,7 +484,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -494,7 +496,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
@@ -524,7 +526,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 0, no trim, video/audio content rate = video/audio DCP rate */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -537,7 +539,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -552,7 +554,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -571,7 +573,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
           so that they run fast.  Hence 1 second in the DCP uses (25/24) * 48000 content samples.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
@@ -584,7 +586,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, no trim, content video rate 24, DCP rate 25, both audio rates still 48k. */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
@@ -597,9 +599,9 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.60)),  80000);
        BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 337500);
 
-       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25, both audio rates still 48k. */
+       /* Position 3s, 1.6s trim, content rate 24, DCP rate 25, both audio rates still 48k */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.6));
+       content->set_trim_start (ContentTime::from_seconds (1.6));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
@@ -607,10 +609,10 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime ()), 0);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.60)),   0);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  80000);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.60)), 160000);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 417500);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (0.60)),      0);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (3.00)),  76800);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (4.60)), 156800);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_audio (piece, stream, DCPTime::from_seconds (9.75)), 414300);
 
        /* Position 0, no trim, content rate 24, DCP rate 48, both audio rates still 48k.
           Now, for example, a DCPTime position of 3s means 3s at 48fps.  Since we run the video
@@ -618,7 +620,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
           The results should be the same as the content rate = DCP rate case.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        stream->_frame_rate = 48000;
@@ -631,7 +633,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -646,7 +648,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -664,7 +666,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
           with skipped frames in this case, audio samples should map straight through.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        stream->_frame_rate = 48000;
@@ -677,7 +679,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, no trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -692,7 +694,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
@@ -709,7 +711,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
           Now 44100 content samples correspond to 1s.
        */
        content->set_position (DCPTime ());
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;
@@ -722,7 +724,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime ());
+       content->set_trim_start (ContentTime ());
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;
@@ -737,7 +739,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 
        /* Position 3s, 1.5s trim, video content rate = video DCP rate, content audio rate = 44.1k */
        content->set_position (DCPTime::from_seconds (3));
-       content->set_trim_start (DCPTime::from_seconds (1.5));
+       content->set_trim_start (ContentTime::from_seconds (1.5));
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;