diff options
| author | Tong Wu <tong1.wu@intel.com> | 2022-09-07 11:26:22 +0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-11-11 09:02:28 +0300 |
| commit | ef4fc111937f6bb253919c376eae1dd2f522e44b (patch) | |
| tree | bd1a53e9b3edb89a23026b988580d32252cb4e7d | |
| parent | 7becf3522126648c872752b6e698d8334f562898 (diff) | |
msdkvpp: delete the macros to make video memory work on Windows
Since gst_msdk_import_to_msdk_surface has been implemented for d3d11, we
delete the macros to make it work on Windows.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
| -rw-r--r-- | subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c index ea99d1905f..a27f915192 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c +++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c @@ -934,13 +934,12 @@ gst_msdkvpp_transform (GstBaseTransform * trans, GstBuffer * inbuf, out_surface = g_slice_new0 (GstMsdkSurface); out_surface->surface = gst_msdk_get_surface_from_buffer (outbuf); } else { -#ifndef _WIN32 out_surface = gst_msdk_import_to_msdk_surface (outbuf, thiz->context, - &thiz->srcpad_info, 0); -#else - out_surface = - gst_msdk_import_sys_mem_to_msdk_surface (outbuf, thiz->srcpad_info); -#endif + &thiz->srcpad_info, GST_MAP_WRITE); + if (!thiz->use_video_memory) { + out_surface = + gst_msdk_import_sys_mem_to_msdk_surface (outbuf, thiz->srcpad_info); + } if (out_surface) out_surface->buf = gst_buffer_ref (outbuf); else { @@ -1027,15 +1026,14 @@ gst_msdkvpp_transform (GstBaseTransform * trans, GstBuffer * inbuf, create_new_surface = TRUE; } else { release_out_surface (thiz, out_surface); -#ifndef _WIN32 out_surface = gst_msdk_import_to_msdk_surface (outbuf_new, thiz->context, - &thiz->srcpad_buffer_pool_info, 0); -#else - out_surface = - gst_msdk_import_sys_mem_to_msdk_surface (outbuf_new, - thiz->srcpad_buffer_pool_info); -#endif + &thiz->srcpad_buffer_pool_info, GST_MAP_WRITE); + if (!thiz->use_video_memory) { + out_surface = + gst_msdk_import_sys_mem_to_msdk_surface (outbuf_new, + thiz->srcpad_buffer_pool_info); + } if (out_surface) { out_surface->buf = gst_buffer_ref (outbuf_new); create_new_surface = TRUE; |