RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video: minor simplification 

This is mostly equivalent, but simpler, and reduces some duplication.
This commit is contained in:
wm4 2014-08-22 14:18:40 +02:00
parent aeb3f08280
commit bc90f71d35
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
player/video.c
View File

@ -701,41 +701,31 @@ void write_video(struct MPContext *mpctx, double endpts)
int r = update_video(mpctx, endpts);
MP_TRACE(mpctx, "update_video: %d\n", r);
if (r == VD_WAIT) // Demuxer will wake us up for more packets to decode.
return;
if (r < 0)
goto error;
if (r == VD_EOF && vo_still_displaying(vo)) {
mpctx->video_status = STATUS_DRAINING;
if (r == VD_WAIT) // Demuxer will wake us up for more packets to decode.
return;
}
if (r == VD_NEW_FRAME) {
if (mpctx->video_status > STATUS_PLAYING)
mpctx->video_status = STATUS_PLAYING;
} else if (r <= 0) {
// EOF or error
if (r == VD_EOF) {
mpctx->video_status =
vo_still_displaying(vo) ? STATUS_DRAINING : STATUS_EOF;
mpctx->delay = 0;
mpctx->last_av_difference = 0;
mpctx->video_status = STATUS_EOF;
MP_VERBOSE(mpctx, "video EOF\n");
MP_VERBOSE(mpctx, "video EOF (status=%d)\n", mpctx->video_status);
return;
} else {
if (mpctx->video_status > STATUS_PLAYING)
mpctx->video_status = STATUS_PLAYING;
// Decode more in next iteration.
mpctx->sleeptime = 0;
MP_TRACE(mpctx, "filtering more video\n");
}
if (mpctx->video_status > STATUS_PLAYING)
mpctx->video_status = STATUS_PLAYING;
mpctx->time_frame -= get_relative_time(mpctx);
update_avsync_before_frame(mpctx);
if (r != VD_NEW_FRAME)
if (r != VD_NEW_FRAME) {
mpctx->sleeptime = 0; // Decode more in next iteration.
return;
}
// Filter output is different from VO input?
struct mp_image_params p = mpctx->next_frame[0]->params;