vd_lavc: allow switching between hw/sw decoding any time

We just need to provide an entrypoint for it, and move the main init
code to a separate function. This gets rid of the messy video chain full
reinit in command.c, which completely destroyed and recreated the video
state for the purpose of mid-stream hw/sw switching.

3 files changed, 35 insertions, 23 deletions

diff --git a/player/command.c b/player/command.c
index 848905da32..fd793c87c9 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2131,9 +2131,8 @@ static int mp_property_hwdec(void *ctx, struct m_property *prop,
         int current = -2;
         video_vd_control(vd, VDCTRL_GET_HWDEC, &current);
         if (current != opts->hwdec_api) {
+            video_vd_control(vd, VDCTRL_REINIT, NULL);
             double last_pts = mpctx->last_vo_pts;
-            uninit_video_chain(mpctx);
-            reinit_video_chain(mpctx);
             if (last_pts != MP_NOPTS_VALUE)
                 queue_seek(mpctx, MPSEEK_ABSOLUTE, last_pts, MPSEEK_EXACT, true);
         }
diff --git a/video/decode/vd.h b/video/decode/vd.h
index 6f5016ac37..c2ce0bbde8 100644
--- a/video/decode/vd.h
+++ b/video/decode/vd.h
@@ -45,6 +45,7 @@ enum vd_ctrl {
     VDCTRL_QUERY_UNSEEN_FRAMES, // current decoder lag
     VDCTRL_FORCE_HWDEC_FALLBACK, // force software decoding fallback
     VDCTRL_GET_HWDEC,
+    VDCTRL_REINIT,
 };
 
 #endif /* MPLAYER_VD_H */
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 4b013d4ec7..c7ae13dfc5 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -287,24 +287,12 @@ static bool force_fallback(struct dec_video *vd)
     return true;
 }
 
-static int init(struct dec_video *vd, const char *decoder)
+static void reinit(struct dec_video *vd)
 {
-    vd_ffmpeg_ctx *ctx;
-    ctx = vd->priv = talloc_zero(NULL, vd_ffmpeg_ctx);
-    ctx->log = vd->log;
-    ctx->opts = vd->opts;
-    ctx->decoder = talloc_strdup(ctx, decoder);
+    vd_ffmpeg_ctx *ctx = vd->priv;
+    const char *decoder = ctx->decoder;
 
-    if (bstr_endswith0(bstr0(decoder), "_vdpau")) {
-        MP_WARN(vd, "VDPAU decoder '%s' was requested. "
-                "This way of enabling hardware\ndecoding is not supported "
-                "anymore. Use --hwdec=vdpau instead.\nThe --hwdec-codec=... "
-                "option can be used to restrict which codecs are\nenabled, "
-                "otherwise all hardware decoding is tried for all codecs.\n",
-                decoder);
-        uninit(vd);
-        return 0;
-    }
+    uninit_avctx(vd);
 
     struct vd_lavc_hwdec *hwdec = NULL;
 
@@ -333,14 +321,35 @@ static int init(struct dec_video *vd, const char *decoder)
     }
 
     init_avctx(vd, decoder, hwdec);
-    if (!ctx->avctx) {
+    if (!ctx->avctx)
         force_fallback(vd);
-        if (!ctx->avctx) {
-            uninit(vd);
-            return 0;
-        }
+}
+
+static int init(struct dec_video *vd, const char *decoder)
+{
+    vd_ffmpeg_ctx *ctx;
+    ctx = vd->priv = talloc_zero(NULL, vd_ffmpeg_ctx);
+    ctx->log = vd->log;
+    ctx->opts = vd->opts;
+    ctx->decoder = talloc_strdup(ctx, decoder);
+
+    if (bstr_endswith0(bstr0(decoder), "_vdpau")) {
+        MP_WARN(vd, "VDPAU decoder '%s' was requested. "
+                "This way of enabling hardware\ndecoding is not supported "
+                "anymore. Use --hwdec=vdpau instead.\nThe --hwdec-codec=... "
+                "option can be used to restrict which codecs are\nenabled, "
+                "otherwise all hardware decoding is tried for all codecs.\n",
+                decoder);
+        uninit(vd);
+        return 0;
     }
 
+    reinit(vd);
+
+    if (!ctx->avctx) {
+        uninit(vd);
+        return 0;
+    }
     return 1;
 }
 
@@ -796,6 +805,9 @@ static int control(struct dec_video *vd, int cmd, void *arg)
         if (force_fallback(vd))
             return ctx->avctx ? CONTROL_OK : CONTROL_ERROR;
         return CONTROL_FALSE;
+    case VDCTRL_REINIT:
+        reinit(vd);
+        return CONTROL_TRUE;
     }
     return CONTROL_UNKNOWN;
 }