X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a40c65cd54027e7a553ea416098793302f490533;hb=1d68fe1e3ad1a9aa85fa7fc6071a0b8c64973953;hp=3ceaac8c1b667fe39781dc027f5b21a2289e128e;hpb=bd0fbdae25424a491b30427443a0ce2b338522b8;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 3ceaac8c1..a40c65cd5 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -293,8 +293,8 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 					true
 					),
 				Position<int> (
-					rint (_video_container_size.width * i->rectangle.x),
-					rint (_video_container_size.height * i->rectangle.y)
+					lrint (_video_container_size.width * i->rectangle.x),
+					lrint (_video_container_size.height * i->rectangle.y)
 					)
 				)
 			);
@@ -524,10 +524,7 @@ 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 ();
 	s = min (piece->content->length_after_trim(), s);
-	/* We're returning a frame index here so we need to floor() the conversion since we want to know the frame
-	   that contains t, I think
-	*/
-	return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames_floor (vc->video_frame_rate ());
+	return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames_round (vc->video_frame_rate ());
 }
 
 DCPTime