Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/GStreamer/gstreamer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTong Wu <tong1.wu@intel.com>2022-10-17 12:01:18 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-11-11 09:02:28 +0300
commitf6e207eb1b129a8051a53bafe1b74295e22fb413 (patch)
treeb2ef61e8bc60fedfe8571b7749a1021b27b4ac83
parent7f18f11a90d5d10764cff6b47622da4452e29e50 (diff)
msdkallocator_d3d: add d3d11 video memory and import it to msdk surface
This patch introduces d3d11 texture and index to GstMsdkMemoryID and implements gst_msdk_import_to_msdk_surface in order to wrap the surface to mfxMemId. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
-rw-r--r--subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator.h5
-rw-r--r--subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_d3d.c70
-rw-r--r--subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c5
3 files changed, 74 insertions, 6 deletions
diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator.h b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator.h
index 9a4106d96d..53bbdda595 100644
--- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator.h
+++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator.h
@@ -49,9 +49,8 @@ struct _GstMsdkMemoryID {
VAImage image;
VADRMPRIMESurfaceDescriptor desc;
#else
- /* TODO: This is just to avoid compile errors on Windows.
- * Implement handling Windows-specific video-memory.
- */
+ ID3D11Texture2D *texture;
+ guint subresource_index;
gint pitch;
guint offset;
#endif
diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_d3d.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_d3d.c
index 791752e6e5..d7388237fa 100644
--- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_d3d.c
+++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_d3d.c
@@ -30,8 +30,22 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <gst/d3d11/gstd3d11.h>
#include "gstmsdkallocator.h"
+#define GST_MSDK_FRAME_SURFACE gst_msdk_frame_surface_quark_get ()
+static GQuark
+gst_msdk_frame_surface_quark_get (void)
+{
+ static gsize g_quark;
+
+ if (g_once_init_enter (&g_quark)) {
+ gsize quark = (gsize) g_quark_from_static_string ("GstMsdkFrameSurface");
+ g_once_init_leave (&g_quark, quark);
+ }
+ return g_quark;
+}
+
mfxStatus
gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
mfxFrameAllocResponse * resp)
@@ -74,6 +88,62 @@ gst_msdk_frame_get_hdl (mfxHDL pthis, mfxMemId mid, mfxHDL * hdl)
return MFX_ERR_NONE;
}
+GstMsdkSurface *
+gst_msdk_import_to_msdk_surface (GstBuffer * buf, GstMsdkContext * msdk_context,
+ GstVideoInfo * vinfo, guint map_flag)
+{
+ GstMemory *mem = NULL;
+ mfxFrameInfo frame_info = { 0, };
+ GstMsdkSurface *msdk_surface = NULL;
+ mfxFrameSurface1 *mfx_surface = NULL;
+ GstMsdkMemoryID *msdk_mid = NULL;
+ GstMapInfo map_info;
+
+ mem = gst_buffer_peek_memory (buf, 0);
+ msdk_surface = g_slice_new0 (GstMsdkSurface);
+
+ if (!gst_is_d3d11_memory (mem) || gst_buffer_n_memory (buf) > 1) {
+ /* d3d11 buffer should hold single memory object */
+ g_slice_free (GstMsdkSurface, msdk_surface);
+ return NULL;
+ }
+
+ if (!gst_buffer_map (buf, &map_info, map_flag | GST_MAP_D3D11)) {
+ GST_ERROR ("Failed to map buffer");
+ g_slice_free (GstMsdkSurface, msdk_surface);
+ return NULL;
+ }
+
+ /* If buffer has qdata pointing to mfxFrameSurface1, directly extract it */
+ if ((mfx_surface = gst_mini_object_get_qdata (GST_MINI_OBJECT_CAST (mem),
+ GST_MSDK_FRAME_SURFACE))) {
+ msdk_surface->from_qdata = TRUE;
+ msdk_surface->surface = mfx_surface;
+ gst_buffer_unmap (buf, &map_info);
+ return msdk_surface;
+ }
+
+ mfx_surface = g_slice_new0 (mfxFrameSurface1);
+ msdk_mid = g_slice_new0 (GstMsdkMemoryID);
+ mfx_surface->Data.MemId = (mfxMemId) msdk_mid;
+
+ msdk_mid->texture = (ID3D11Texture2D *) (gpointer) map_info.data;
+ msdk_mid->subresource_index = GPOINTER_TO_UINT (map_info.user_data[0]);
+
+ gst_buffer_unmap (buf, &map_info);
+
+ gst_msdk_set_mfx_frame_info_from_video_info (&frame_info, vinfo);
+ mfx_surface->Info = frame_info;
+
+ /* Set mfxFrameSurface1 as qdata in buffer */
+ gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (mem),
+ GST_MSDK_FRAME_SURFACE, mfx_surface, NULL);
+
+ msdk_surface->surface = mfx_surface;
+
+ return msdk_surface;
+}
+
void
gst_msdk_set_frame_allocator (GstMsdkContext * context)
{
diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c
index e8ef40a086..3a797327de 100644
--- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c
+++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c
@@ -1684,14 +1684,13 @@ gst_msdkenc_get_surface_from_frame (GstMsdkEnc * thiz,
msdk_surface->surface = gst_msdk_get_surface_from_buffer (inbuf);
return msdk_surface;
}
-#ifndef _WIN32
+
msdk_surface = gst_msdk_import_to_msdk_surface (inbuf, thiz->context,
- &thiz->input_state->info, 0);
+ &thiz->input_state->info, GST_MAP_READ);
if (msdk_surface) {
msdk_surface->buf = gst_buffer_ref (inbuf);
return msdk_surface;
}
-#endif
/* If upstream hasn't accpeted the proposed msdk bufferpool,
* just copy frame to msdk buffer and take a surface from it.