Changeset 102383 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Nov 29, 2023 5:49:56 PM (14 months ago)

Author:

vboxsync

Message:

WDDM: user mode driver update: bugref:10529

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx

Files:

• VBoxDX.h (modified) (2 diffs)
• VBoxDXDDI.cpp (modified) (2 diffs)
• VBoxDXDDIVideo.cpp (modified) (1 diff)
• VBoxDXVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.h

@@ -64 +64 @@
 
     bool f3D;
+
+    uint32_t fVBoxCaps;
 
     VBOXWDDM_QAI AdapterInfo;
@@ -753 +755 @@
 void vboxDXGetVideoProcessorRateConversionCaps(PVBOXDX_DEVICE pDevice, PVBOXDXVIDEOPROCESSORENUM pVideoProcessorEnum,
                                                D3D11_1DDI_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps);
+void vboxDXGetVideoProcessorCustomRate(PVBOXDX_DEVICE pDevice, PVBOXDXVIDEOPROCESSORENUM pVideoProcessorEnum,
+                                       UINT CustomRateIndex, D3D11_1DDI_VIDEO_PROCESSOR_CUSTOM_RATE *pRate);
 void vboxDXGetVideoProcessorFilterRange(PVBOXDX_DEVICE pDevice, PVBOXDXVIDEOPROCESSORENUM pVideoProcessorEnum,
                                         D3D11_1DDI_VIDEO_PROCESSOR_FILTER Filter, D3D11_1DDI_VIDEO_PROCESSOR_FILTER_RANGE *pFilterRange);

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDI.cpp

@@ -119 +119 @@
     pAdapter->f3D = true;
 
+    pAdapter->fVBoxCaps = pHWInfo->u.svga.au32Caps[SVGA3D_DEVCAP_3D];
+
     *ppAdapter = pAdapter;
 
@@ -3958 +3960 @@
         AssertReturn(ParamSize >= sizeof(D3D11_1DDI_VIDEO_INPUT), E_INVALIDARG);
 
-#if 0
-        D3D11_1DDI_VIDEO_INPUT *pVideoInput = (D3D11_1DDI_VIDEO_INPUT *)pParams;
-        return ddi11_1RetrieveVideoFunctions(pDevice, pVideoInput);
-#else
-        RT_NOREF(pDevice, pParams);
-#endif
+        if (pDevice->pAdapter->fVBoxCaps & VBSVGA3D_CAP_VIDEO)
+        {
+            D3D11_1DDI_VIDEO_INPUT *pVideoInput = (D3D11_1DDI_VIDEO_INPUT *)pParams;
+            return ddi11_1RetrieveVideoFunctions(pDevice, pVideoInput);
+        }
+        return E_FAIL;
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDIVideo.cpp

@@ -312 +312 @@
     D3D10DDI_HDEVICE hDevice,
     D3D11_1DDI_HVIDEOPROCESSORENUM hProcessorEnum,
+    UINT RateConversionIndex,
     UINT CustomRateIndex,
-    UINT RateConversionIndex,
     D3D11_1DDI_VIDEO_PROCESSOR_CUSTOM_RATE *pRate)
 {
     PVBOXDX_DEVICE pDevice = (PVBOXDX_DEVICE)hDevice.pDrvPrivate;
     PVBOXDXVIDEOPROCESSORENUM pVideoProcessorEnum = (PVBOXDXVIDEOPROCESSORENUM)hProcessorEnum.pDrvPrivate;
-    DEBUG_BREAKPOINT_TEST();
-
-    RT_NOREF(pDevice, pVideoProcessorEnum, CustomRateIndex, RateConversionIndex);
-    RT_ZERO(*pRate); /* Not supported. */
+    //DEBUG_BREAKPOINT_TEST();
+
+    RT_NOREF(RateConversionIndex); /* One capability. */
+    vboxDXGetVideoProcessorCustomRate(pDevice, pVideoProcessorEnum, CustomRateIndex, pRate);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXVideo.cpp

@@ -471 +471 @@
     pCaps->ConversionCaps  = pInfo->RateCaps.ProcessorCaps;
     pCaps->ITelecineCaps   = pInfo->RateCaps.ITelecineCaps;
-    pCaps->CustomRateCount = 0;
+    pCaps->CustomRateCount = RT_MIN(pInfo->RateCaps.CustomRateCount, VBSVGA3D_MAX_VIDEO_CUSTOM_RATE_CAPS);;
+}
+
+
+void vboxDXGetVideoProcessorCustomRate(PVBOXDX_DEVICE pDevice, PVBOXDXVIDEOPROCESSORENUM pVideoProcessorEnum,
+                                       UINT CustomRateIndex, D3D11_1DDI_VIDEO_PROCESSOR_CUSTOM_RATE *pRate)
+{
+    if (memcmp(&pVideoProcessorEnum->svga.desc,
+               &pDevice->VideoDevice.videoProcessorEnum.desc, sizeof(pVideoProcessorEnum->svga.desc)) != 0)
+        vboxDXQueryVideoProcessorEnumInfo(pDevice, pVideoProcessorEnum->svga.desc);
+
+    VBSVGA3dVideoProcessorEnumInfo const *pInfo = &pDevice->VideoDevice.videoProcessorEnum.info;
+    VBSVGA3dVideoProcessorCustomRateCaps const *pCustomRateCaps = &pInfo->aCustomRateCaps[CustomRateIndex];
+    pRate->CustomRate.Numerator   = pCustomRateCaps->CustomRate.numerator;
+    pRate->CustomRate.Denominator = pCustomRateCaps->CustomRate.denominator;
+    pRate->OutputFrames           = pCustomRateCaps->OutputFrames;
+    pRate->InputInterlaced        = RT_BOOL(pCustomRateCaps->InputInterlaced);
+    pRate->InputFramesOrFields    = pCustomRateCaps->InputFramesOrFields;
 }