DX11 - Support non-array texture allocation

softworkz · May 9, 2020 · c09cc37 · c09cc37
1 parent 8f22257
commit c09cc37
Show file tree

Hide file tree

Showing 3 changed files with 193 additions and 97 deletions.
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
@@ -559,10 +559,10 @@ static void ff_dxva2_lock(AVCodecContext *avctx)
         AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
         if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
             WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE);
-        if (sctx->device_ctx) {
-            AVD3D11VADeviceContext *hwctx = sctx->device_ctx->hwctx;
-            hwctx->lock(hwctx->lock_ctx);
-        }
+        ////if (sctx->device_ctx) {
+        ////    AVD3D11VADeviceContext *hwctx = sctx->device_ctx->hwctx;
+        ////    hwctx->lock(hwctx->lock_ctx);
+        ////}
     }
 #endif
 }
@@ -575,10 +575,10 @@ static void ff_dxva2_unlock(AVCodecContext *avctx)
         AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
         if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
             ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex);
-        if (sctx->device_ctx) {
-            AVD3D11VADeviceContext *hwctx = sctx->device_ctx->hwctx;
-            hwctx->unlock(hwctx->lock_ctx);
-        }
+        ////if (sctx->device_ctx) {
+        ////    AVD3D11VADeviceContext *hwctx = sctx->device_ctx->hwctx;
+        ////    hwctx->unlock(hwctx->lock_ctx);
+        ////}
     }
 #endif
 }