Apply reverse of recent dcp_to_content_video fix to content_video_to_dcp.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d6e142c5e810ffd8dd5ec359345d4f35acb2590f..caa2791b8d573c3c2ad32efae0e9cd4239b56eb9 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -540,8 +540,9 @@ 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 ()) - piece->content->trim_start ();
-       return max (DCPTime (), DCPTime (c, piece->frc) + piece->content->position ());
+       /* See comment in dcp_to_content_video */
+       DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc);
+       return max (DCPTime (), d + piece->content->position ());
 }
 
 Frame