diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-31 21:36:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-31 21:36:36 +0000 |
| commit | 8bccd0af23b8e1ada43182c2531c21f06036ca37 (patch) | |
| tree | e8a71402c4804e673fa1e1c97bf7beeba40db37f /src/lib/player.cc | |
| parent | 2d04092a7938c078ade1a1f54a485b96a23d510c (diff) | |
Fix missing subtitles when they start just after the start of a frame.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 9ee8ab72c..ec7a93dac 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -658,7 +658,9 @@ Player::subtitles_for_frame (DCPTime time) const { list<PositionImage> subtitles; - BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate())), _always_burn_subtitles)) { + int const vfr = _film->video_frame_rate(); + + BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) { /* Image subtitles */ list<PositionImage> c = transform_image_subtitles (i.image); @@ -666,7 +668,7 @@ Player::subtitles_for_frame (DCPTime time) const /* Text subtitles (rendered to an image) */ if (!i.text.empty ()) { - list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time); + list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time, vfr); copy (s.begin(), s.end(), back_inserter (subtitles)); } } |