From: Carl Hetherington <cth@carlh.net>
Date: Tue, 14 Jan 2014 10:39:07 +0000 (+0000)
Subject: Scale subtitle times with frame rate change if they are part of a piece of video... 
X-Git-Tag: v2.0.48~921^2~11
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=057400eb1718e8769592e34e07d90405eb95605f;p=dcpomatic.git

Scale subtitle times with frame rate change if they are part of a piece of video content.
---

diff --git a/ChangeLog b/ChangeLog
index b35298c88..fadc8f509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-14  Carl Hetherington  <cth@carlh.net>
+
+	* Try to fix subtitle problems when the video frame rate is being changed
+	from content to DCP.
+
 2014-01-13  Carl Hetherington  <cth@carlh.net>
 
 	* Change 4:3 and 5:3 ratios to be precise rather than 1.33:1 and 1.66:1, and
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index b672b2c1f..a6f9a17c3 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -556,7 +556,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 	   source that we may have chopped off for the DCP)
 	*/
 	double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset;
-	
+
 	/* hence start time for this sub */
 	Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
 	Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 9f8599693..56145f5bd 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -292,6 +292,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 
 		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
 	}
+		
 					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
@@ -683,8 +684,18 @@ Player::update_subtitle ()
 		_in_subtitle.image->pixel_format (),
 		true
 		);
-	_out_subtitle.from = _in_subtitle.from + piece->content->position ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
+
+	/* XXX: hack */
+	Time from = _in_subtitle.from;
+	Time to = _in_subtitle.to;
+	shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (piece->content);
+	if (vc) {
+		from = rint (from * vc->video_frame_rate() / _film->video_frame_rate());
+		to = rint (to * vc->video_frame_rate() / _film->video_frame_rate());
+	}
+	
+	_out_subtitle.from = from * piece->content->position ();
+	_out_subtitle.to = to + piece->content->position ();
 }
 
 /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.