[vlc-commits] d3d11va: create a video context for the VA

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 22 13:08:41 2019 +0200| [4ab1cdef67ad3b283bddf677389b7974e196581b] | committer: Steve Lhomme

d3d11va: create a video context for the VA

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ab1cdef67ad3b283bddf677389b7974e196581b
---

 modules/codec/avcodec/d3d11va.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 1eb7ca437e..ff7bdb4407 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -110,6 +110,8 @@ struct vlc_va_sys_t
     d3d11_handle_t               hd3d;
     d3d11_device_t               d3d_dev;
 
+    vlc_video_context            *vctx;
+
     /* Video service */
     DXGI_FORMAT                  render;
 
@@ -309,6 +311,9 @@ static void Close(vlc_va_t *va)
     if (sys->va_pool)
         va_pool_Close(va, sys->va_pool);
 
+    if (sys->vctx)
+        vlc_video_context_Release(sys->vctx);
+
     D3D11_Destroy( &sys->hd3d );
 
     free(sys);
@@ -363,17 +368,31 @@ static int Open(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *des
         {
             if (sys->d3d_dev.context_mutex == INVALID_HANDLE_VALUE)
                 msg_Warn(va, "No mutex found to lock the decoder");
-            void *d3dvidctx = NULL;
-            hr = ID3D11DeviceContext_QueryInterface(sys->d3d_dev.d3dcontext, &IID_ID3D11VideoContext, &d3dvidctx);
-            if (FAILED(hr)) {
-               msg_Err(va, "Could not Query ID3D11VideoContext Interface from the picture. (hr=0x%lX)", hr);
-               D3D11_ReleaseDevice(&sys->d3d_dev);
-            } else {
-                sys->hw.video_context = d3dvidctx;
+
+            sys->vctx = vlc_video_context_Create( dec_device, VLC_VIDEO_CONTEXT_D3D11VA, 0, NULL );
+            if (likely(sys->vctx != NULL))
+            {
+                void *d3dvidctx = NULL;
+                hr = ID3D11DeviceContext_QueryInterface(sys->d3d_dev.d3dcontext, &IID_ID3D11VideoContext, &d3dvidctx);
+                if (FAILED(hr)) {
+                    msg_Err(va, "Could not Query ID3D11VideoContext Interface from the picture. (hr=0x%lX)", hr);
+                    D3D11_ReleaseDevice(&sys->d3d_dev);
+                    vlc_video_context_Release( sys->vctx );
+                    sys->vctx = NULL;
+                } else {
+                    sys->hw.video_context = d3dvidctx;
+                }
             }
         }
     }
 
+    if (sys->vctx == NULL)
+    {
+        msg_Dbg(va, "no video context");
+        err = VLC_EGENERIC;
+        goto error;
+    }
+
     static const struct va_pool_cfg pool_cfg = {
         D3dCreateDevice,
         D3dDestroyDevice,
@@ -414,9 +433,12 @@ static int Open(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *des
     ctx->hwaccel_context = &sys->hw;
 
     va->ops = &ops;
+    *vtcx_out = sys->vctx;
     return VLC_SUCCESS;
 
 error:
+    if (sys->vctx)
+        vlc_video_context_Release(sys->vctx);
     Close(va);
     return err;
 }