mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdkenc: Directly import va memory as mfx surface

Browse source 
If input buffer is of va memory, we can directly obtain va surface from
the buffer and wrap it as mfx surface.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
This commit is contained in:
Mengkejiergeli Ba 2022-04-21 17:27:09 +08:00
parent a8c1cec051
commit b2e18f7f88
1 changed files with 28 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
subprojects/gst-plugins-bad/sys/msdk/gstmsdkenc.c
View file

@ -131,10 +131,6 @@ typedef struct
{ {
mfxFrameSurface1 *surface; mfxFrameSurface1 *surface;
GstBuffer *buf; GstBuffer *buf;
GstBuffer *buf_external;
#ifndef _WIN32
VASurfaceID cache_surface;
#endif
} MsdkSurface; } MsdkSurface;
void void
@ -980,19 +976,6 @@ gst_msdkenc_create_surface (mfxFrameSurface1 * surface, GstBuffer * buf)
static void static void
gst_msdkenc_free_surface (MsdkSurface * surface) gst_msdkenc_free_surface (MsdkSurface * surface)
{ {
if (surface->buf_external) {
GstMsdkMemoryID *msdk_mid = NULL;
mfxFrameSurface1 *mfx_surface = NULL;
mfx_surface = surface->surface;
msdk_mid = (GstMsdkMemoryID *) mfx_surface->Data.MemId;
#ifndef _WIN32
*msdk_mid->surface = surface->cache_surface;
#endif
gst_buffer_unref (surface->buf_external);
}
if (surface->buf) if (surface->buf)
gst_buffer_unref (surface->buf); gst_buffer_unref (surface->buf);
@ -1723,47 +1706,33 @@ static gboolean
import_va_surface_to_msdk (GstMsdkEnc * thiz, GstBuffer * buf, import_va_surface_to_msdk (GstMsdkEnc * thiz, GstBuffer * buf,
MsdkSurface * msdk_surface) MsdkSurface * msdk_surface)
{ {
GstVideoInfo vinfo; VASurfaceID va_surface;
GstVideoMeta *vmeta; mfxFrameInfo frame_info = { {0,}, 0, };
GstMsdkMemoryID *msdk_mid = NULL;
mfxFrameSurface1 *mfx_surface = NULL; mfxFrameSurface1 *mfx_surface = NULL;
VASurfaceID surface; GstMsdkMemoryID *msdk_mid = NULL;
gint i; mfxMemId *mfx_mid = NULL;
surface = gst_va_buffer_get_surface (buf); va_surface = gst_va_buffer_get_surface (buf);
if (surface == VA_INVALID_SURFACE) if (va_surface == VA_INVALID_SURFACE)
return FALSE; return FALSE;
vinfo = thiz->input_state->info; mfx_surface = g_slice_new0 (mfxFrameSurface1);
/* Update offset/stride/size if there is VideoMeta attached to msdk_mid = g_slice_new0 (GstMsdkMemoryID);
* the buffer */ mfx_mid = g_slice_new0 (mfxMemId);
vmeta = gst_buffer_get_video_meta (buf);
if (vmeta) {
if (GST_VIDEO_INFO_FORMAT (&vinfo) != vmeta->format ||
GST_VIDEO_INFO_WIDTH (&vinfo) != vmeta->width ||
GST_VIDEO_INFO_HEIGHT (&vinfo) != vmeta->height ||
GST_VIDEO_INFO_N_PLANES (&vinfo) != vmeta->n_planes) {
GST_ERROR_OBJECT (thiz, "VideoMeta attached to buffer is not matching"
"the negotiated width/height/format");
return FALSE;
}
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&vinfo); ++i) {
GST_VIDEO_INFO_PLANE_OFFSET (&vinfo, i) = vmeta->offset[i];
GST_VIDEO_INFO_PLANE_STRIDE (&vinfo, i) = vmeta->stride[i];
}
GST_VIDEO_INFO_SIZE (&vinfo) = gst_buffer_get_size (buf);
}
if (GST_VIDEO_INFO_SIZE (&vinfo) < GST_VIDEO_INFO_SIZE (&thiz->aligned_info)) msdk_mid->surface = g_slice_new0 (VASurfaceID);
return FALSE; *msdk_mid->surface = va_surface;
msdk_surface->buf_external = gst_buffer_ref (buf); mfx_mid = (mfxMemId *) msdk_mid;
mfx_surface->Data.MemId = mfx_mid;
mfx_surface = msdk_surface->surface; gst_msdk_set_mfx_frame_info_from_video_info (&frame_info,
msdk_mid = (GstMsdkMemoryID *) mfx_surface->Data.MemId; &thiz->input_state->info);
mfx_surface->Info = frame_info;
msdk_surface->buf = gst_buffer_ref (buf);
msdk_surface->surface = mfx_surface;
msdk_surface->cache_surface = *msdk_mid->surface;
*msdk_mid->surface = surface;
return TRUE; return TRUE;
} }
#endif #endif
@ -1785,6 +1754,15 @@ 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
if (thiz->use_va) {
msdk_surface = g_slice_new0 (MsdkSurface);
if (import_va_surface_to_msdk (thiz, inbuf, msdk_surface))
return msdk_surface;
else
g_slice_free (MsdkSurface, msdk_surface);
}
#endif
/* If upstream hasn't accpeted the proposed msdk bufferpool, /* If upstream hasn't accpeted the proposed msdk bufferpool,
* just copy frame (if not dmabuf backed )to msdk buffer and take a surface from it. * just copy frame (if not dmabuf backed )to msdk buffer and take a surface from it.
@ -1794,13 +1772,6 @@ gst_msdkenc_get_surface_from_frame (GstMsdkEnc * thiz,
goto error; goto error;
#ifndef _WIN32 #ifndef _WIN32
/************** VA import *****************/
if (thiz->use_va) {
if (import_va_surface_to_msdk (thiz, inbuf, msdk_surface)) {
return msdk_surface;
}
}
/************ dmabuf-import ************* */ /************ dmabuf-import ************* */
/* if upstream provided a dmabuf backed memory, but not an msdk /* if upstream provided a dmabuf backed memory, but not an msdk
* buffer, we could try to export the dmabuf to underlined vasurface */ * buffer, we could try to export the dmabuf to underlined vasurface */