Merge pull request #22456 from TolyaTalamanov:at/onevpl-fixes-linux

alalek · alalek · commit 5bb098ba5d87 · 2022-09-02T21:55:49.000Z
diff --git a/modules/gapi/samples/onevpl_infer_single_roi.cpp b/modules/gapi/samples/onevpl_infer_single_roi.cpp
@@ -499,11 +499,11 @@ int main(int argc, char *argv[]) {
         std::tie(dx11_dev, dx11_ctx) = create_device_with_ctx(intel_adapter.get());
         gpu_accel_device = cv::util::make_optional(
                             cv::gapi::wip::onevpl::create_dx11_device(
-                                                        reinterpret_cast<void*>(dx11_dev.get()),
+                                                        reinterpret_cast<void*>(dx11_dev.release()),
                                                         "GPU"));
         gpu_accel_ctx = cv::util::make_optional(
                             cv::gapi::wip::onevpl::create_dx11_context(
-                                                        reinterpret_cast<void*>(dx11_ctx.get())));
+                                                        reinterpret_cast<void*>(dx11_ctx.release())));
 #endif // HAVE_D3D11
 #endif // HAVE_DIRECTX
 #ifdef __linux__
diff --git a/modules/gapi/src/streaming/onevpl/accelerators/accel_policy_va_api.cpp b/modules/gapi/src/streaming/onevpl/accelerators/accel_policy_va_api.cpp
@@ -42,7 +42,14 @@ VPLVAAPIAccelerationPolicy::VPLVAAPIAccelerationPolicy(device_selector_ptr_t sel
     GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current configuration");
 #endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 }
+#else // __linux__
+VPLVAAPIAccelerationPolicy::VPLVAAPIAccelerationPolicy(device_selector_ptr_t selector) :
+    VPLAccelerationPolicy(selector) {
+    GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current configuration");
+}
+#endif // __linux__
 
+#if defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 VPLVAAPIAccelerationPolicy::~VPLVAAPIAccelerationPolicy() {
     vaTerminate(va_handle);
     GAPI_LOG_INFO(nullptr, "destroyed");
@@ -90,12 +97,7 @@ cv::MediaFrame::AdapterPtr VPLVAAPIAccelerationPolicy::create_frame_adapter(pool
     return cpu_dispatcher->create_frame_adapter(key, params);
 }
 
-#else // __linux__
-
-VPLVAAPIAccelerationPolicy::VPLVAAPIAccelerationPolicy(device_selector_ptr_t selector) :
-    VPLAccelerationPolicy(selector) {
-    GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current configuration");
-}
+#else // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 
 VPLVAAPIAccelerationPolicy::~VPLVAAPIAccelerationPolicy() = default;
 
@@ -128,7 +130,7 @@ cv::MediaFrame::AdapterPtr VPLVAAPIAccelerationPolicy::create_frame_adapter(pool
                                                                           const FrameConstructorArgs &) {
     GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current configuration");
 }
-#endif // __linux__
+#endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 } // namespace onevpl
 } // namespace wip
 } // namespace gapi
diff --git a/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp b/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
@@ -31,12 +31,11 @@
 #endif // HAVE_DIRECTX
 
 #ifdef __linux__
+#include <fcntl.h>
+#include <unistd.h>
 #if defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 #include "va/va.h"
 #include "va/va_drm.h"
-
-#include <fcntl.h>
-#include <unistd.h>
 #endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 #endif // __linux__
 
