Changeset 57875 in vbox

Timestamp:

Sep 24, 2015 9:46:27 AM (9 years ago)

Author:

vboxsync

Message:

WINNT/WDDM: Implement support for the YV12 surface format, fixes VLC crashing with certain videos previously because their YV12 to YUY2 conversion plugin seems to be buggy

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (2 diffs)
• disp/wddm/VBoxDispD3DIf.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -501 +501 @@
     VBOXVHWA_INFO aInfos[VBOX_VIDEO_MAX_SCREENS];
 } VBOXWDDM_QI;
+
+/** Convert a given FourCC code to a D3DDDIFORMAT enum. */
+#define VBOXWDDM_D3DDDIFORMAT_FROM_FOURCC(_a, _b, _c, _d) \
+    ((D3DDDIFORMAT)MAKEFOURCC(_a, _b, _c, _d))
 
 /* submit cmd func */
@@ -601 +605 @@
             return 16;
         case D3DDDIFMT_YUY2: /* 4 bytes per 2 pixels. */
+        case VBOXWDDM_D3DDDIFORMAT_FROM_FOURCC('Y', 'V', '1', '2'):
             return 16;
         default:

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

@@ -22 +22 @@
 #include <iprt/assert.h>
 
+/** Convert a given FourCC code to a D3DDDIFORMAT enum. */
+#define VBOXWDDM_D3DDDIFORMAT_FROM_FOURCC(_a, _b, _c, _d) \
+    ((D3DDDIFORMAT)MAKEFOURCC(_a, _b, _c, _d))
+
 void VBoxDispD3DClose(VBOXDISPD3D *pD3D)
 {
@@ -437 +441 @@
 
     {D3DDDIFMT_YUY2,
+        0|
+        0|
+        0|
+        FORMATOP_CONVERT_TO_ARGB|FORMATOP_OFFSCREENPLAIN|
+        FORMATOP_NOFILTER|
+        FORMATOP_NOALPHABLEND|
+        FORMATOP_NOTEXCOORDWRAPNORMIP, 0, 0, 0},
+
+    {VBOXWDDM_D3DDDIFORMAT_FROM_FOURCC('Y', 'V', '1', '2'),
         0|
         0|