GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 15:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

player: handle video reconfig slightly different again

Browse Source 
Now we avoid calling update_video() twice on reconfig (once to check
whether there are still new frames, and again to actually do the
reconfig). Instead, we check whether there's still something going on
before calling update_video() at all, and depending on that
update_video() will be allowed to reconfig or not.

This will simplify some things later.
This commit is contained in:
wm4
2014-05-07 21:39:17 +02:00
parent 6a8a0e3aa9
commit eada87853e
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
player/playloop.c
+26 -23
View File
@@ -980,10 +980,34 @@ void run_playloop(struct MPContext *mpctx)
struct vo *vo = mpctx->video_out;
update_fps(mpctx);
// Whether there's still at least 1 video frame that can be shown.
// If false, it means we can reconfig the VO if needed (normally, this
// would disrupt playback, so only do it on !still_playing).
bool still_playing = vo_has_next_frame(vo, true);
// For the last frame case (frame is being displayed).
still_playing |= mpctx->playing_last_frame;
still_playing |= mpctx->last_frame_duration > 0;
double frame_time = 0;
int r = update_video(mpctx, endpts, false, &frame_time);
int r = update_video(mpctx, endpts, !still_playing, &frame_time);
MP_VERBOSE(mpctx, "update_video: %d\n", r);
video_left = r > 0 || vo->hasframe || mpctx->playing_last_frame;
if (r < 0) {
MP_FATAL(mpctx, "Could not initialize video chain.\n");
int uninit = INITIALIZED_VCODEC;
if (!opts->force_vo)
uninit |= INITIALIZED_VO;
uninit_player(mpctx, uninit);
if (!mpctx->current_track[STREAM_AUDIO])
mpctx->stop_play = PT_NEXT_ENTRY;
mpctx->error_playing = true;
handle_force_window(mpctx, true);
video_left = false;
break;
}
video_left = r > 0 || vo->hasframe || still_playing;
if (!mpctx->paused || mpctx->restart_playback) {
if (r == 0) {
if (!mpctx->playing_last_frame && mpctx->last_frame_duration > 0) {
@@ -995,30 +1019,9 @@ void run_playloop(struct MPContext *mpctx)
if (mpctx->playing_last_frame) {
r = 1; // don't stop playback yet
MP_VERBOSE(mpctx, "still showing last frame\n");
} else if (r == 0) {
// We just displayed the previous frame, so display the
// new frame (if there's one) immediately.
mpctx->video_next_pts = MP_NOPTS_VALUE;
// Format changes behave like EOF, and this call "unstucks"
// the EOF condition (after waiting for the previous frame
// to finish displaying).
r = update_video(mpctx, endpts, true, &frame_time);
MP_VERBOSE(mpctx, "second update_video: %d\n", r);
}
}
if (r < 0) {
MP_FATAL(mpctx, "Could not initialize video chain.\n");
int uninit = INITIALIZED_VCODEC;
if (!opts->force_vo)
uninit |= INITIALIZED_VO;
uninit_player(mpctx, uninit);
if (!mpctx->current_track[STREAM_AUDIO])
mpctx->stop_play = PT_NEXT_ENTRY;
mpctx->error_playing = true;
handle_force_window(mpctx, true);
break;
}
MP_VERBOSE(mpctx, "frametime=%5.3f\n", frame_time);
video_left = r >= 1;
if (r == 2 && !mpctx->restart_playback) {
player/video.c
+3
View File
@@ -469,6 +469,9 @@ static int video_output_image(struct MPContext *mpctx, bool reconfig_ok)
return -1;
}
init_vo(mpctx);
// Display the frame queued after this immediately.
// (Neutralizes frame time calculation in update_video.)
mpctx->video_next_pts = MP_NOPTS_VALUE;
}
// Queue new frame, if there's one.