path: root/player/sub.c
diff options
authorwm4 <wm4@nowhere>2016-10-26 20:43:03 +0200
committerwm4 <wm4@nowhere>2016-10-26 20:44:05 +0200
commit90b968a67a73473d615e2ee6135756573d0da6f2 (patch)
treeb587fa97140e35d27f08f35fb0f5c53f21b28b0a /player/sub.c
parentfc4318d23e07cb1e3b212dfe21e5988ef23f6749 (diff)
player: show subtitles on VO if --force-window is used
If a VO is created, but no video is playing (i.e. --force-window is used), then until now no subtitles were shown. This is because VO subtitle display normally depends on video frame timing. If there are no video frames, there can be no subtitles. Change this and add some code to handle this situation specifically. Set a subtitle PTS manually and request VO redrawing manually, which gets the subtitles rendered somehow. This is kind of shaky. The subtitles are essentially sampled at arbitrary times (such as when new audio data is decoded and pushed to the AO, or on user interaction). To make a it slightly more consistent, force a completely arbitrary minimum FPS of 10. Other solutions (such as creating fake video) would be more intrusive or would require VO-level API changes. Fixes #3684.
Diffstat (limited to 'player/sub.c')
1 files changed, 13 insertions, 0 deletions
diff --git a/player/sub.c b/player/sub.c
index c4a24fe011..04af1e1e15 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -112,6 +112,19 @@ static bool update_subtitle(struct MPContext *mpctx, double video_pts,
if (mpctx->current_track[0][STREAM_SUB] == track && !mpctx->video_out)
term_osd_set_subs(mpctx, sub_get_text(dec_sub, video_pts));
+ // Handle displaying subtitles on VO with no video being played. This is
+ // quite differently, because normally subtitles are redrawn on new video
+ // frames, using the video frames' timestamps.
+ if (mpctx->video_out && !mpctx->vo_chain) {
+ if (osd_get_force_video_pts(mpctx->osd) != video_pts) {
+ osd_set_force_video_pts(mpctx->osd, video_pts);
+ osd_query_and_reset_want_redraw(mpctx->osd);
+ vo_redraw(mpctx->video_out);
+ }
+ // Force an arbitrary minimum FPS
+ mp_set_timeout(mpctx, 0.1);
+ }
return true;