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>

diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c
index ea99d19..a27f915 100644 (file)
--- 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;