FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

msdkdec: acquire buffer from video pool on Windows

Browse Source 
Video memory is available on Windows. This patch is to make the buffers
acquired from d3d11 video pool.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
This commit is contained in:
Tong Wu 2022-11-17 10:37:05 +08:00 committed by GStreamer Marge Bot
parent d2902be9eb
commit abe4d0046a
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
subprojects/gst-plugins-bad/sys/msdk/gstmsdkdec.c
View File

@ -194,14 +194,15 @@ allocate_output_surface (GstMsdkDec * thiz)
{ {
GstMsdkSurface *msdk_surface = NULL; GstMsdkSurface *msdk_surface = NULL;
GstBuffer *out_buffer = NULL; GstBuffer *out_buffer = NULL;
#ifndef _WIN32
GstMemory *mem = NULL; GstMemory *mem = NULL;
mfxFrameSurface1 *mfx_surface = NULL; mfxFrameSurface1 *mfx_surface = NULL;
#endif
gint n = 0; gint n = 0;
guint retry_times = gst_util_uint64_scale_ceil (GST_USECOND, guint retry_times = gst_util_uint64_scale_ceil (GST_USECOND,
thiz->param.mfx.FrameInfo.FrameRateExtD, thiz->param.mfx.FrameInfo.FrameRateExtD,
thiz->param.mfx.FrameInfo.FrameRateExtN); thiz->param.mfx.FrameInfo.FrameRateExtN);
#ifdef _WIN32
GstMapInfo map_info;
#endif
/* Free un-unsed msdk surfaces firstly, hence the associated mfx /* Free un-unsed msdk surfaces firstly, hence the associated mfx
* surfaces will be moved from used list to available list */ * surfaces will be moved from used list to available list */
@ -220,13 +221,21 @@ allocate_output_surface (GstMsdkDec * thiz)
break; break;
} }
} }
#ifndef _WIN32
if ((gst_buffer_pool_acquire_buffer (thiz->alloc_pool, &out_buffer, NULL)) if ((gst_buffer_pool_acquire_buffer (thiz->alloc_pool, &out_buffer, NULL))
!= GST_FLOW_OK) { != GST_FLOW_OK) {
GST_ERROR_OBJECT (thiz, "Failed to allocate output buffer"); GST_ERROR_OBJECT (thiz, "Failed to allocate output buffer");
return NULL; return NULL;
} }
#ifdef _WIN32
/* For d3d11 we should call gst_buffer_map with GST_MAP_WRITE |
* GST_MAP_D3D11 flags to make sure the staging texture has been uploaded
*/
if (!gst_buffer_map (out_buffer, &map_info, GST_MAP_WRITE | GST_MAP_D3D11)) {
GST_ERROR ("Failed to map buffer");
return NULL;
}
#endif
mem = gst_buffer_peek_memory (out_buffer, 0); mem = gst_buffer_peek_memory (out_buffer, 0);
msdk_surface = g_slice_new0 (GstMsdkSurface); msdk_surface = g_slice_new0 (GstMsdkSurface);
@ -234,36 +243,14 @@ allocate_output_surface (GstMsdkDec * thiz)
GST_MSDK_FRAME_SURFACE))) { GST_MSDK_FRAME_SURFACE))) {
msdk_surface->surface = mfx_surface; msdk_surface->surface = mfx_surface;
msdk_surface->from_qdata = TRUE; msdk_surface->from_qdata = TRUE;
#ifdef _WIN32
gst_buffer_unmap (out_buffer, &map_info);
#endif
} else { } else {
GST_ERROR ("No available surfaces"); GST_ERROR ("No available surfaces");
g_slice_free (GstMsdkSurface, msdk_surface); g_slice_free (GstMsdkSurface, msdk_surface);
return NULL; return NULL;
} }
#else
if (!gst_buffer_pool_is_active (thiz->pool) &&
!gst_buffer_pool_set_active (thiz->pool, TRUE)) {
GST_ERROR_OBJECT (thiz, "Failed to activate buffer pool");
return NULL;
}
if ((gst_buffer_pool_acquire_buffer (thiz->pool, &out_buffer, NULL))
!= GST_FLOW_OK) {
GST_ERROR_OBJECT (thiz, "Failed to allocate output buffer");
gst_buffer_pool_set_active (thiz->pool, FALSE);
return NULL;
}
GstVideoCodecState *output_state =
gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
msdk_surface =
gst_msdk_import_sys_mem_to_msdk_surface (out_buffer, &output_state->info);
gst_video_codec_state_unref (output_state);
if (!msdk_surface)
return NULL;
#endif
msdk_surface->buf = out_buffer; msdk_surface->buf = out_buffer;