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>
This commit is contained in:
Tong Wu 2022-10-17 17:01:18 +08:00 committed by GStreamer Marge Bot
parent 7f18f11a90
commit f6e207eb1b
3 changed files with 74 additions and 6 deletions

View file

@ -49,9 +49,8 @@ struct _GstMsdkMemoryID {
VAImage image; VAImage image;
VADRMPRIMESurfaceDescriptor desc; VADRMPRIMESurfaceDescriptor desc;
#else #else
/* TODO: This is just to avoid compile errors on Windows. ID3D11Texture2D *texture;
* Implement handling Windows-specific video-memory. guint subresource_index;
*/
gint pitch; gint pitch;
guint offset; guint offset;
#endif #endif

View file

@ -30,8 +30,22 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <gst/d3d11/gstd3d11.h>
#include "gstmsdkallocator.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 mfxStatus
gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req, gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
mfxFrameAllocResponse * resp) mfxFrameAllocResponse * resp)
@ -74,6 +88,62 @@ gst_msdk_frame_get_hdl (mfxHDL pthis, mfxMemId mid, mfxHDL * hdl)
return MFX_ERR_NONE; 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 void
gst_msdk_set_frame_allocator (GstMsdkContext * context) gst_msdk_set_frame_allocator (GstMsdkContext * context)
{ {

View file

@ -1684,14 +1684,13 @@ gst_msdkenc_get_surface_from_frame (GstMsdkEnc * thiz,
msdk_surface->surface = gst_msdk_get_surface_from_buffer (inbuf); msdk_surface->surface = gst_msdk_get_surface_from_buffer (inbuf);
return msdk_surface; return msdk_surface;
} }
#ifndef _WIN32
msdk_surface = gst_msdk_import_to_msdk_surface (inbuf, thiz->context, 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) { if (msdk_surface) {
msdk_surface->buf = gst_buffer_ref (inbuf); msdk_surface->buf = gst_buffer_ref (inbuf);
return msdk_surface; return msdk_surface;
} }
#endif
/* If upstream hasn't accpeted the proposed msdk bufferpool, /* If upstream hasn't accpeted the proposed msdk bufferpool,
* just copy frame to msdk buffer and take a surface from it. * just copy frame to msdk buffer and take a surface from it.