summaryrefslogtreecommitdiffstats
path: root/player/video.c
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-07-15 21:38:59 -0500
committerDudemanguy <random342@airmail.cc>2023-07-22 17:42:25 +0000
commitca4192e2df7bcfdb9e18461f19e1bd2dd0ee3c7a (patch)
tree484dec633e65b23db9914282c029e64bb772b940 /player/video.c
parent61f07975578d70dfbb7ce5ddca8386fa434d3437 (diff)
downloadmpv-ca4192e2df7bcfdb9e18461f19e1bd2dd0ee3c7a.tar.bz2
mpv-ca4192e2df7bcfdb9e18461f19e1bd2dd0ee3c7a.tar.xz
player/video: check for forced eof
It's a bit of an edge case, but since we now allow the disabling of the software fallback it's possible to have a situation where hwdec completely fails and the mpv window is still lingering from the previous item in the playlist. What needs to happen is simply that the vo_chain should uninit itself and handle force_window if needed. In order to do that, a new VDCTRL is added that checks vd_lavc if force_eof was set. player/video will then start the uninit process if needed after getting this.
Diffstat (limited to 'player/video.c')
-rw-r--r--player/video.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/player/video.c b/player/video.c
index 547f67c9de..0161929c46 100644
--- a/player/video.c
+++ b/player/video.c
@@ -573,6 +573,16 @@ static bool check_for_hwdec_fallback(struct MPContext *mpctx)
return true;
}
+static bool check_for_forced_eof(struct MPContext *mpctx)
+{
+ struct vo_chain *vo_c = mpctx->vo_chain;
+ struct mp_decoder_wrapper *dec = vo_c->track->dec;
+
+ bool forced_eof = false;
+ mp_decoder_wrapper_control(dec, VDCTRL_CHECK_FORCED_EOF, &forced_eof);
+ return forced_eof;
+}
+
/* Update avsync before a new video frame is displayed. Actually, this can be
* called arbitrarily often before the actual display.
* This adjusts the time of the next video frame */
@@ -1041,6 +1051,11 @@ void write_video(struct MPContext *mpctx)
if (r == VD_EOF) {
if (check_for_hwdec_fallback(mpctx))
return;
+ if (check_for_forced_eof(mpctx)) {
+ uninit_video_chain(mpctx);
+ handle_force_window(mpctx, true);
+ return;
+ }
if (vo_c->filter->failed_output_conversion)
goto error;