Skip to content

[DLStreamer] Merge gvawatermark3d and gvadeskew into gstvideoanalytics library #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mholowni wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[DLStreamer] Merge gvawatermark3d and gvadeskew into gstvideoanalytics library #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a10a2b
[DLStreamer] Merge gvawatermark3d and gvadeskew into gstvideoanalytic…
mholowni Dec 17, 2025
bb4779e
build fix
mholowni Dec 17, 2025
e363bd8
change per review comment
tbujewsk Dec 18, 2025
eda8c23
Merge branch 'main' into dls-mh-merge-elements
mholowni Dec 18, 2025
48ead89
Merge branch 'main' into dls-mh-merge-elements
mholowni Dec 18, 2025
96f318c
Revert "change per review comment"
mholowni Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions libraries/dl-streamer/src/monolithic/gst/elements/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@

set (TARGET_NAME "elements")

find_package(OpenCV REQUIRED core imgproc)
find_package(OpenCV REQUIRED core imgproc calib3d)
find_package(PkgConfig REQUIRED)
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(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
pkg_check_modules(GSTAUDIO gstreamer-audio-1.0>=1.16 REQUIRED)
endif()
Expand All @@ -24,6 +25,10 @@ file (GLOB MAIN_SRC
gvawatermark/renderer/*.cpp
gvawatermark/renderer/cpu/*.cpp
gvawatermark/*.c
gvawatermark3d/*.cpp
gvawatermark3d/*.c
gvadeskew/*.cpp
gvadeskew/*.c
)

file (GLOB MAIN_HEADERS
Expand All @@ -32,6 +37,8 @@ file (GLOB MAIN_HEADERS
gvawatermark/*.h
gvawatermark/renderer/*.h
gvawatermark/renderer/cpu/*.h
gvawatermark3d/*.h
gvadeskew/*.h
)

if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
Expand All @@ -55,6 +62,8 @@ PUBLIC
gvawatermark
gvawatermark/renderer
gvametaaggregate
gvawatermark3d
gvadeskew
PRIVATE
${GSTREAMER_INCLUDE_DIRS}
${GSTVIDEO_INCLUDE_DIRS}
Expand Down Expand Up @@ -100,8 +109,6 @@ add_subdirectory(gvaattachroi)
add_subdirectory(gvametapublish)
add_subdirectory(gvapython)
add_subdirectory(gvatrack)
add_subdirectory(gvadeskew)
add_subdirectory(gvawatermark3d)
add_subdirectory(gvamotiondetect)
if(ENABLE_REALSENSE)
add_subdirectory(gvarealsense)
Expand Down
51 changes: 0 additions & 51 deletions libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/CMakeLists.txt
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/gvadeskew.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,10 @@ static void gst_gvadeskew_init(GstGvaDeskew *self) {
}

static gboolean plugin_init(GstPlugin *plugin) {
return gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW);
if (!gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW))
return FALSE;

return TRUE;
}
Comment on lines 421 to 426
Copy link
Member

@yunowo yunowo Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This init function is no longer needed

Copy link
Contributor Author

@mholowni mholowni Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other plugins plugin_init (in gstvideoanalitics library) is included, and without it we`ve got compilation errors:
https://github.com/open-edge-platform/edge-ai-libraries/blob/main/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark/gvawatermark.cpp#L672-L680


GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvadeskew, PRODUCT_FULL_NAME " gvadeskew element", plugin_init,
Copy link
Member

@yunowo yunowo Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to remove this reference to plugin_init here, so you have compilation error.

Expand Down
48 changes: 0 additions & 48 deletions libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/CMakeLists.txt
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/gvawatermark3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,18 @@ static void gst_gvawatermark3d_init(GstGvaWatermark3D *self) {
self->K = cv::Mat();
}

static gboolean plugin_init(GstPlugin *plugin) {
return gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D);
}

static void gst_gvawatermark3d_finalize(GObject *object) {
GstGvaWatermark3D *self = GST_GVAWATERMARK3D(object);
g_free(self->intrinsics_file);
G_OBJECT_CLASS(gst_gvawatermark3d_parent_class)->finalize(object);
}

static gboolean plugin_init(GstPlugin *plugin) {
if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
return FALSE;

return TRUE;
}

GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvawatermark3d, PRODUCT_FULL_NAME " gvawatermark3d element",
plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)
2 changes: 2 additions & 0 deletions libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametapublish/file/
${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvatrack/
${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark/
${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark3d/
${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvadeskew/
)

target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS})
Expand Down
6 changes: 6 additions & 0 deletions libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "gstgvatrack.h"
#include "gstgvawatermarkimpl.h"
#include "gvawatermark.h"
#include "gvawatermark3d.h"
#include "gvadeskew.h"
#include "inference_backend/logger.h"
#include "logger_functions.h"

Expand Down Expand Up @@ -58,6 +60,10 @@ static gboolean plugin_init(GstPlugin *plugin) {
return FALSE;
if (!gst_element_register(plugin, "gvametaaggregate", GST_RANK_NONE, GST_TYPE_GVA_META_AGGREGATE))
return FALSE;
if (!gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW))
return FALSE;
if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
return FALSE;
#if _MSC_VER
if (!gst_element_register(plugin, "gvametapublish", GST_RANK_NONE, GST_TYPE_GVA_META_PUBLISH))
return FALSE;
Expand Down
Loading