Merge gvamotiondetect into gstvideoanalytics library (#511)

* Merge gvamotiondetect into gstvideoanalytics library

* fix fedora build

* delete unused imports

* delete fedora fix - move fix to another PR

* Fix fedora docker build (#517)

* Fix fedora docker build

* more fixes

* remove unused library, fix build

Author: mholowni

src/monolithic/gst/elements/CMakeLists.txt

@@ -12,6 +12,9 @@ pkg_check_modules(GSTREAMER gstreamer-1.0>=1.16 REQUIRED)
 pkg_check_modules(GSTVIDEO gstreamer-video-1.0>=1.16 REQUIRED)
 pkg_check_modules(GSTALLOC gstreamer-allocators-1.0 REQUIRED)
 pkg_search_module(VA va libva REQUIRED)
+if(NOT MSVC)
+  pkg_check_modules(GSTVA REQUIRED IMPORTED_TARGET gstreamer-va-1.0)
+endif()
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
         pkg_check_modules(GSTAUDIO gstreamer-audio-1.0>=1.16 REQUIRED)
 endif()
@@ -31,6 +34,13 @@ file (GLOB MAIN_SRC
     gvadeskew/*.c
 )
 
+# gvamotiondetect platform-specific source
+if(MSVC OR WIN32)
+    list(APPEND MAIN_SRC gvamotiondetect/gvamotiondetect_win.cpp)
+else()
+    list(APPEND MAIN_SRC gvamotiondetect/gvamotiondetect.cpp)
+endif()
+
 file (GLOB MAIN_HEADERS
     gvametaconvert/*.h
     gvametaaggregate/*.h
@@ -39,6 +49,7 @@ file (GLOB MAIN_HEADERS
     gvawatermark/renderer/cpu/*.h
     gvawatermark3d/*.h
     gvadeskew/*.h
+    gvamotiondetect/*.h
 )
 
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
@@ -64,6 +75,7 @@ PUBLIC
     gvametaaggregate
     gvawatermark3d
     gvadeskew
+    gvamotiondetect
 PRIVATE
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTVIDEO_INCLUDE_DIRS}
@@ -91,8 +103,17 @@ PRIVATE
     json-hpp
     json-schema-validator
     utils
+    dlstreamer_gst_meta
+    gstvideoanalyticsmeta
 )
 
+if(NOT MSVC)
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        ${GSTVA_LIBRARIES}
+        dlstreamer_vaapi
+    )
+endif()
+
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
         target_link_libraries(${TARGET_NAME} PRIVATE ${GSTAUDIO_LIBRARIES})
 endif()
@@ -109,7 +130,6 @@ add_subdirectory(gvaattachroi)
 add_subdirectory(gvametapublish)
 add_subdirectory(gvapython)
 add_subdirectory(gvatrack)
-add_subdirectory(gvamotiondetect)
 if(ENABLE_REALSENSE)
     add_subdirectory(gvarealsense)
 endif()

src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
+ * Copyright (C) 2025-2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -275,7 +275,7 @@ static GstCaps *gst_gva_motion_detect_transform_caps(GstBaseTransform *, GstPadD
 // -----------------------------------------------------------------------------
 // VA API helper functions
 // Map GST buffer to VA surface (using mapper + fallback) and return VASurfaceID
-static VASurfaceID gva_motion_detect_get_surface(GstGvaMotionDetect *self, GstBuffer *buf) {
+static VASurfaceID gva_motion_detect_get_surface([[maybe_unused]] GstGvaMotionDetect *self, GstBuffer *buf) {
     if (!buf)
         return VA_INVALID_SURFACE;
     VASurfaceID sid = gst_va_buffer_get_surface(buf);
@@ -308,8 +308,8 @@ static bool gva_motion_detect_convert_from_surface(GstGvaMotionDetect *self, VAS
 }
 
 // Write cv::UMat back into the VA surface; returns false on failure
-static bool gva_motion_detect_write_to_surface(GstGvaMotionDetect *self, const cv::UMat &src, VASurfaceID sid,
-                                               int width, int height) {
+[[maybe_unused]] static bool gva_motion_detect_write_to_surface(GstGvaMotionDetect *self, const cv::UMat &src,
+                                                                VASurfaceID sid, int width, int height) {
     if (sid == VA_INVALID_SURFACE || !self->va_dpy)
         return false;
     try {
@@ -453,7 +453,8 @@ static gboolean gst_gva_motion_detect_start(GstBaseTransform *trans) {
     return TRUE;
 }
 
-static gboolean gst_gva_motion_detect_set_caps(GstBaseTransform *trans, GstCaps *incaps, GstCaps *outcaps) {
+static gboolean gst_gva_motion_detect_set_caps(GstBaseTransform *trans, GstCaps *incaps,
+                                               [[maybe_unused]] GstCaps *outcaps) {
     GstGvaMotionDetect *self = GST_GVA_MOTION_DETECT(trans);
     if (!gst_video_info_from_caps(&self->vinfo, incaps))
         return FALSE;
@@ -1115,10 +1116,3 @@ static void gst_gva_motion_detect_process_and_attach(GstGvaMotionDetect *self, G
     if (!stable.empty())
         gst_gva_motion_detect_attach_rois(self, buf, stable, width, height);
 }
-
-static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT);
-}
-
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvamotiondetect, PRODUCT_FULL_NAME " gvamotiondetect element",
-                  plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)

src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect.cpp

@@ -1,11 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- ******************************************************************************/
-
-/*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
+ * Copyright (C) 2025-2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -573,10 +567,3 @@ static void gst_gva_motion_detect_init(GstGvaMotionDetect *self) {
     self->frame_index = 0;
     g_mutex_init(&self->meta_mutex);
 }
-
-static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT);
-}
-
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvamotiondetect, PRODUCT_FULL_NAME " gvamotiondetect element",
-                  plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)

src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect_win.cpp

@@ -34,6 +34,7 @@ PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvatrack/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark3d/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvamotiondetect/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvadeskew/
 )
 

src/monolithic/gst/registrator/CMakeLists.txt

@@ -22,6 +22,7 @@
 #include "gstgvatrack.h"
 #include "gstgvawatermarkimpl.h"
 #include "gvadeskew.h"
+#include "gvamotiondetect.h"
 #include "gvawatermark.h"
 #include "gvawatermark3d.h"
 #include "inference_backend/logger.h"
@@ -67,6 +68,8 @@ static gboolean plugin_init(GstPlugin *plugin) {
         return FALSE;
     if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
         return FALSE;
+    if (!gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT))
+        return FALSE;
 #if _MSC_VER
     if (!gst_element_register(plugin, "gvametapublish", GST_RANK_NONE, GST_TYPE_GVA_META_PUBLISH))
         return FALSE;