mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdk: don't cache mfxFrameAllocResponse pointer

Browse source 
Otherwise it is possible that different wrappers share the same
mfxFrameAllocResponse pointer, so instead of caching the pointer, we may
cache the content of mfxFrameAllocResponse
This commit is contained in:
Haihao Xiang 2019-09-11 10:49:10 +08:00 committed by Víctor Manuel Jáquez Leal
parent f840e304f3
commit e50011c064
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/msdk/gstmsdkallocator_libva.c
View file

@ -69,10 +69,10 @@ gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
gst_msdk_context_get_cached_alloc_responses_by_request (context, req);
if (cached) {
/* check if enough frames were allocated */
if (req->NumFrameSuggested > cached->response->NumFrameActual)
if (req->NumFrameSuggested > cached->response.NumFrameActual)
return MFX_ERR_MEMORY_ALLOC;
*resp = *cached->response;
*resp = cached->response;
return MFX_ERR_NONE;
}
}
@ -205,8 +205,7 @@ gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
resp->mids = mids;
resp->NumFrameActual = surfaces_num;
msdk_resp->response = resp;
msdk_resp->mem_ids = mids;
msdk_resp->response = *resp;
msdk_resp->request = *req;
gst_msdk_context_add_alloc_response (context, msdk_resp);

6
sys/msdk/gstmsdkcontext.c
View file

@ -346,7 +346,7 @@ _find_response (gconstpointer resp, gconstpointer comp_resp)
GstMsdkAllocResponse *cached_resp = (GstMsdkAllocResponse *) resp;
mfxFrameAllocResponse *_resp = (mfxFrameAllocResponse *) comp_resp;
return cached_resp ? cached_resp->mem_ids != _resp->mids : -1;
return cached_resp ? cached_resp->response.mids != _resp->mids : -1;
}
static gint
@ -400,8 +400,8 @@ create_surfaces (GstMsdkContext * context, GstMsdkAllocResponse * resp)
mfxMemId *mem_id;
mfxFrameSurface1 *surface;
for (i = 0; i < resp->response->NumFrameActual; i++) {
mem_id = resp->mem_ids[i];
for (i = 0; i < resp->response.NumFrameActual; i++) {
mem_id = resp->response.mids[i];
surface = (mfxFrameSurface1 *) g_slice_new0 (mfxFrameSurface1);
if (!surface) {
GST_ERROR ("failed to allocate surface");

3
sys/msdk/gstmsdkcontext.h
View file

@ -97,9 +97,8 @@ gint gst_msdk_context_get_fd (GstMsdkContext * context);
typedef struct _GstMsdkAllocResponse GstMsdkAllocResponse;
struct _GstMsdkAllocResponse {
mfxFrameAllocResponse *response;
mfxFrameAllocResponse response;
mfxFrameAllocRequest request;
mfxMemId *mem_ids;
GList *surfaces_avail;
GList *surfaces_used;
GList *surfaces_locked;