diff options
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 9f8599693..ce5109733 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -224,7 +224,8 @@ Player::pass () continue; } - if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) { + shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder); + if (ad && ad->has_audio ()) { audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position); } } @@ -292,6 +293,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 +685,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. |