[vlc-commits] hw:d3d9: add a file to control the D3D9 device common to all filters

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Nov 22 18:18:33 2017 +0100| [dd3cc8b5cea2e1299ca7acb2f88570c703274476] | committer: Jean-Baptiste Kempf

hw:d3d9: add a file to control the D3D9 device common to all filters

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/hw/d3d9/Makefile.am     |   3 +-
 modules/hw/d3d9/d3d9_filters.h  |   5 ++
 modules/hw/d3d9/d3d9_instance.c | 107 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/modules/hw/d3d9/Makefile.am b/modules/hw/d3d9/Makefile.am
index fabec1b6e3..1711953e39 100644
--- a/modules/hw/d3d9/Makefile.am
+++ b/modules/hw/d3d9/Makefile.am
@@ -3,7 +3,8 @@ d3d9dir = $(pluginsdir)/d3d9
 libdirect3d9_filters_plugin_la_SOURCES = hw/d3d9/d3d9_filters.h \
     hw/d3d9/d3d9_filters.c \
     hw/d3d9/dxva2_deinterlace.c \
-    hw/d3d9/dxa9.c
+    hw/d3d9/dxa9.c \
+    hw/d3d9/d3d9_instance.c
 libdirect3d9_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(d3d9dir)'
 libdirect3d9_filters_plugin_la_LIBADD = libchroma_copy.la libdeinterlace_common.la libd3d9_common.la $(LIBCOM)
 
diff --git a/modules/hw/d3d9/d3d9_filters.h b/modules/hw/d3d9/d3d9_filters.h
index 0d495dc2e5..ee0878bf3e 100644
--- a/modules/hw/d3d9/d3d9_filters.h
+++ b/modules/hw/d3d9/d3d9_filters.h
@@ -25,6 +25,8 @@
 
 #include <vlc_common.h>
 
+#include "../../video_chroma/d3d9_fmt.h"
+
 int  D3D9OpenDeinterlace(vlc_object_t *);
 void D3D9CloseDeinterlace(vlc_object_t *);
 int  D3D9OpenConverter(vlc_object_t *);
@@ -32,4 +34,7 @@ void D3D9CloseConverter(vlc_object_t *);
 int  D3D9OpenCPUConverter(vlc_object_t *);
 void D3D9CloseCPUConverter(vlc_object_t *);
 
+void D3D9_FilterHoldInstance(filter_t *, d3d9_device_t *, D3DSURFACE_DESC *);
+void D3D9_FilterReleaseInstance(d3d9_device_t *);
+
 #endif /* VLC_D3D9_FILTERS_H */
diff --git a/modules/hw/d3d9/d3d9_instance.c b/modules/hw/d3d9/d3d9_instance.c
new file mode 100644
index 0000000000..81dc704b26
--- /dev/null
+++ b/modules/hw/d3d9/d3d9_instance.c
@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * d3d9_instance.c: D3D9 unique device context instance
+ *****************************************************************************
+ * Copyright © 2017 VLC authors, VideoLAN and VideoLabs
+ *
+ * Authors: Steve Lhomme <robux4 at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_filter.h>
+#include <vlc_picture.h>
+
+#include <assert.h>
+
+#define COBJMACROS
+#include <d3d9.h>
+
+#include "d3d9_filters.h"
+
+static vlc_mutex_t inst_lock = VLC_STATIC_MUTEX;
+static d3d9_device_t device = { .dev = NULL };
+static size_t instances = 0;
+
+void D3D9_FilterHoldInstance(filter_t *filter, d3d9_device_t *out, D3DSURFACE_DESC *dstDesc)
+{
+    out->dev = NULL;
+
+    picture_t *pic = filter_NewPicture(filter);
+    if (!pic)
+        return;
+
+    picture_sys_t *p_sys = ActivePictureSys(pic);
+
+    vlc_mutex_lock(&inst_lock);
+    if (p_sys)
+    {
+        if (FAILED(IDirect3DSurface9_GetDevice( p_sys->surface, &out->dev )))
+            goto done;
+        IDirect3DDevice9_Release(out->dev);
+        if (FAILED(IDirect3DSurface9_GetDesc( p_sys->surface, dstDesc )))
+        {
+            out->dev = NULL;
+            goto done;
+        }
+
+        if (device.dev == NULL)
+        {
+            device.dev = out->dev;
+            instances++;
+        }
+    }
+    else
+    {
+        *out = device;
+        if (device.dev != NULL)
+            instances++;
+
+        memset(dstDesc, 0, sizeof(*dstDesc));
+        if (filter->fmt_in.video.i_chroma == VLC_CODEC_D3D9_OPAQUE_10B)
+            dstDesc->Format = MAKEFOURCC('P','0','1','0');
+        else
+            dstDesc->Format = MAKEFOURCC('N','V','1','2');
+        dstDesc->Width  = filter->fmt_out.video.i_width;
+        dstDesc->Height = filter->fmt_out.video.i_height;
+    }
+
+    out->owner = false;
+    if (unlikely(out->dev == NULL))
+        msg_Warn(filter, "no context available");
+    else
+        IDirect3DDevice9_AddRef(out->dev);
+
+done:
+    vlc_mutex_unlock(&inst_lock);
+
+    picture_Release(pic);
+}
+
+void D3D9_FilterReleaseInstance(d3d9_device_t *d3d_dev)
+{
+    vlc_mutex_lock(&inst_lock);
+    if (d3d_dev->dev && d3d_dev->dev == device.dev)
+    {
+        assert(instances != 0);
+        if (--instances == 0)
+            device.dev = NULL;
+    }
+    D3D9_ReleaseDevice(d3d_dev);
+    vlc_mutex_unlock(&inst_lock);
+}