From ffdb290bcba1cb9a3e2e6768ee254629d696dd36 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 31 Aug 2015 15:32:18 +0100
Subject: [PATCH] Apply reverse of recent dcp_to_content_video fix to
 content_video_to_dcp.

---
 src/lib/player.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d6e142c5e..caa2791b8 100644
--- 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
-- 
2.30.2