VideoManager: Remove Old GStreamer Qt Plugin Code

mavlink · Jan 9, 2025 · 9905b7d · 9905b7d
1 parent f7e78bb
commit 9905b7d
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 2,631 deletions.
diff --git a/cmake/find-modules/FindGStreamer.cmake b/cmake/find-modules/FindGStreamer.cmake
@@ -200,7 +200,7 @@ elseif(GST_VERSION_MINOR EQUAL 20)
 elseif(GST_VERSION_MINOR EQUAL 22)
     set(GST_VERSION_PATCH 12)
 elseif(GST_VERSION_MINOR EQUAL 24)
-    set(GST_VERSION_PATCH 8)
+    set(GST_VERSION_PATCH 11)
 endif()
 
 set(GST_PLUGINS_VERSION ${GST_VERSION_MAJOR}.${GST_VERSION_MINOR}.${GST_VERSION_PATCH})

diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt
@@ -106,18 +106,21 @@ endif()
 
 ################################################################################
 
-if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
+if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.20)
+    if(GStreamer_VERSION VERSION_LESS 1.24)
+        set(GST_PLUGINS_VERSION 1.22.12)
+    endif()
     FetchContent_Declare(gstreamer_good_plugins
         # URL https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${GST_PLUGINS_VERSION}/gstreamer-${GST_PLUGINS_VERSION}.zip?path=subprojects/gst-plugins-good/ext/qt6
         URL https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${GST_PLUGINS_VERSION}.tar.xz
         DOWNLOAD_EXTRACT_TIMESTAMP true
     )
     FetchContent_MakeAvailable(gstreamer_good_plugins)
     set(QGC_GST_QT6_PLUGIN_PATH "${gstreamer_good_plugins_SOURCE_DIR}/ext/qt6")
+    cmake_print_variables(QGC_GST_QT6_PLUGIN_PATH)
 else()
-    set(QGC_GST_QT6_PLUGIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qt6")
+    return()
 endif()
-cmake_print_variables(QGC_GST_QT6_PLUGIN_PATH)
 
 ################################################################################
 

diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstplugin.cc b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstplugin.cc