GStreamer: Add qml6d3d11 Video Sink

Author: HTRamsey

.github/workflows/custom.yml

@@ -36,7 +36,7 @@ jobs:
     env:
       ARTIFACT: QGroundControl-installer.exe
       QT_VERSION: 6.8.3
-      GST_VERSION: 1.22.12
+      GST_VERSION: 1.26.3
 
     steps:
       - name: Checkout repo

.github/workflows/windows.yml

@@ -39,7 +39,7 @@ jobs:
       ARTIFACT: QGroundControl-installer.exe
       PACKAGE: QGroundControl-installer
       QT_VERSION: 6.8.3
-      GST_VERSION: 1.22.12
+      GST_VERSION: 1.26.3
 
     steps:
       - name: Checkout repo

cmake/find-modules/FindGStreamer.cmake

@@ -1,6 +1,8 @@
 if(NOT DEFINED GStreamer_FIND_VERSION)
     if(LINUX)
         set(GStreamer_FIND_VERSION 1.20)
+    elseif(WIN32)
+        set(GStreamer_FIND_VERSION 1.26.3)
     else()
         set(GStreamer_FIND_VERSION 1.22.12)
     endif()
@@ -225,18 +227,21 @@ endif()
 
 ################################################################################
 
-if(GStreamer_USE_STATIC_LIBS)
-    set(GSTREAMER_EXTRA_DEPS
-        gstreamer-base-1.0
-        gstreamer-video-1.0
-        gstreamer-gl-1.0
-        gstreamer-gl-prototypes-1.0
-        gstreamer-rtsp-1.0
-        # gstreamer-gl-egl-1.0
-        # gstreamer-gl-wayland-1.0
-        # gstreamer-gl-x11-1.0
-    )
+set(GSTREAMER_EXTRA_DEPS
+    gstreamer-base-1.0
+    gstreamer-video-1.0
+    gstreamer-rtsp-1.0
+    gstreamer-gl-1.0
+    gstreamer-gl-prototypes-1.0
+    # gstreamer-gl-egl-1.0
+    # gstreamer-gl-wayland-1.0
+    # gstreamer-gl-x11-1.0
+)
+if(WIN32)
+    list(APPEND GSTREAMER_EXTRA_DEPS gstreamer-d3d11-1.0)
+endif()
 
+if(GStreamer_USE_STATIC_LIBS)
     set(GSTREAMER_PLUGINS
         coreelements
         dav1d
@@ -338,9 +343,9 @@ endfunction()
 find_gstreamer_component(Core gstreamer-1.0)
 find_gstreamer_component(Base gstreamer-base-1.0)
 find_gstreamer_component(Video gstreamer-video-1.0)
+find_gstreamer_component(Rtsp gstreamer-rtsp-1.0)
 find_gstreamer_component(Gl gstreamer-gl-1.0)
 find_gstreamer_component(GlPrototypes gstreamer-gl-prototypes-1.0)
-find_gstreamer_component(Rtsp gstreamer-rtsp-1.0)
 
 ################################################################################
 
@@ -356,6 +361,10 @@ if(GlX11 IN_LIST GStreamer_FIND_COMPONENTS)
     find_gstreamer_component(GlX11 gstreamer-gl-x11-1.0)
 endif()
 
+if(D3d11 IN_LIST GStreamer_FIND_COMPONENTS)
+    find_gstreamer_component(D3d11 gstreamer-d3d11-1.0)
+endif()
+
 ################################################################################
 
 include(FindPackageHandleStandardArgs)
@@ -405,11 +414,16 @@ if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer)
             GStreamer::Core
             GStreamer::Base
             GStreamer::Video
+            GStreamer::Rtsp
             GStreamer::Gl
             GStreamer::GlPrototypes
-            GStreamer::Rtsp
     )
 
+    if(TARGET GStreamer::D3d11)
+        target_compile_definitions(GStreamer::D3d11 INTERFACE GST_USE_UNSTABLE_API)
+        target_link_libraries(GStreamer::GStreamer INTERFACE GStreamer::D3d11)
+    endif()
+
     foreach(component IN LISTS GStreamer_FIND_COMPONENTS)
         if(GStreamer_${component}_FOUND)
             target_link_libraries(GStreamer::GStreamer INTERFACE GStreamer::${component})

src/QGCApplication.cc

@@ -330,8 +330,13 @@ void QGCApplication::init()
 void QGCApplication::_initVideo()
 {
 #ifdef QGC_GST_STREAMING
+#ifdef Q_OS_WIN
+    // Gstreamer video playback requires D3D11
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::Direct3D11);
+#else
     // Gstreamer video playback requires OpenGL
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
+#endif
 #endif
 
     QGCCorePlugin::instance();  // CorePlugin must be initialized before VideoManager for Video Cleanup

src/VideoManager/VideoManager.cc

@@ -75,7 +75,11 @@ void VideoManager::registerQmlTypes()
     (void) qmlRegisterUncreatableType<VideoManager>("QGroundControl.VideoManager", 1, 0, "VideoManager", "Reference only");
     (void) qmlRegisterUncreatableType<VideoReceiver>("QGroundControl", 1, 0, "VideoReceiver","Reference only");
 #ifndef QGC_GST_STREAMING
-    (void) qmlRegisterType<VideoItemStub>("org.freedesktop.gstreamer.Qt6GLVideoItem", 1, 0, "GstGLQt6VideoItem");
+    #ifdef Q_OS_WIN
+        (void) qmlRegisterType<GstVideoItemStub>("org.freedesktop.gstreamer.Qt6D3D11VideoItem", 1, 0, "GstD3D11Qt6VideoItem");
+    #else
+        (void) qmlRegisterType<GstVideoItemStub>("org.freedesktop.gstreamer.Qt6GLVideoItem", 1, 0, "GstGLQt6VideoItem");
+    #endif
 #endif
 }
 

src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt

@@ -6,13 +6,13 @@ if(QGC_ENABLE_GST_VIDEOSTREAMING)
         # Using FindGStreamer.cmake is currently bypassed on MACOS since it doesn't work
         # So for now we hack in a simple hardwired setup which does work
         find_package(GStreamer
+            COMPONENTS Core Base Video Rtsp Gl GlPrototypes
+            OPTIONAL_COMPONENTS GlEgl GlWayland GlX11 D3d11
             REQUIRED
-            COMPONENTS Core Base Video Gl GlPrototypes Rtsp
-            OPTIONAL_COMPONENTS GlEgl GlWayland GlX11)
+        )
     endif()
 
     add_subdirectory(gstqml6gl)
-    # TODO: https://gstreamer.freedesktop.org/documentation/qt6d3d11/index.html#qml6d3d11sink-page
 endif()
 
 if(TARGET gstqml6gl)

src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc

@@ -43,6 +43,7 @@ GST_PLUGIN_STATIC_DECLARE(opengl);
 GST_PLUGIN_STATIC_DECLARE(openh264);
 GST_PLUGIN_STATIC_DECLARE(playback);
 GST_PLUGIN_STATIC_DECLARE(qml6);
+GST_PLUGIN_STATIC_DECLARE(qml6d3d11);
 GST_PLUGIN_STATIC_DECLARE(qsv);
 GST_PLUGIN_STATIC_DECLARE(rtp);
 GST_PLUGIN_STATIC_DECLARE(rtpmanager);
@@ -120,10 +121,19 @@ void _registerPlugins()
     #endif
 #endif
 
-// #if !defined(GST_PLUGIN_qml6_FOUND) && defined(QGC_GST_STATIC_BUILD)
-    GST_PLUGIN_STATIC_REGISTER(qml6);
+// #if !defined(GST_PLUGIN_qml6d3d11_FOUND) || defined(QGC_GST_STATIC_BUILD)
+    // GST_PLUGIN_STATIC_REGISTER(qml6d3d11);
+// #endif
+
+// #if !defined(GST_PLUGIN_qml6_FOUND) || defined(QGC_GST_STATIC_BUILD)
+    // GST_PLUGIN_STATIC_REGISTER(qml6);
 // #endif
 
+    GST_PLUGIN_STATIC_REGISTER(qml6);
+#ifdef Q_OS_WIN
+    GST_PLUGIN_STATIC_REGISTER(qml6d3d11)
+#endif
+
     GST_PLUGIN_STATIC_REGISTER(qgc);
 }
 
@@ -246,7 +256,13 @@ bool _verifyPlugins()
     g_list_foreach(plugins, _checkPlugin, NULL);
     g_list_free(plugins);
 
-    static constexpr const char *pluginNames[2] = {"qml6", "qgc"};
+    static constexpr const char *pluginNames[2] = {
+        "qgc",
+        "qml6"
+#ifdef Q_OS_WIN
+        , "qml6d3d11"
+#endif
+    };
     for (const char *name : pluginNames) {
         GstPlugin *plugin = gst_registry_find_plugin(registry, name);
         if (!plugin) {
@@ -407,9 +423,15 @@ bool initialize()
 
     _setCodecPriorities(static_cast<GStreamer::VideoDecoderOptions>(SettingsManager::instance()->videoSettings()->forceVideoDecoder()->rawValue().toInt()));
 
-    GstElement *sink = gst_element_factory_make("qml6glsink", nullptr);
+#ifdef Q_OS_WIN
+    static constexpr const char *qmlSinkName = "qml6d3d11sink";
+#else
+    static constexpr const char *qmlSinkName = "qml6glsink";
+#endif
+
+    GstElement *sink = gst_element_factory_make(qmlSinkName, nullptr);
     if (!sink) {
-        qCCritical(GStreamerLog) << "failed to init qml6glsink";
+        qCCritical(GStreamerLog) << "failed to init" << qmlSinkName;
         return false;
     }
 
@@ -419,13 +441,19 @@ bool initialize()
 
 void *createVideoSink(QQuickItem *widget, QObject *parent)
 {
-    GstElement *videoSinkBin = gst_element_factory_make("qgcvideosinkbin", NULL);
+#ifdef Q_OS_WIN
+    static constexpr const char *videoSinkBinName = "qgcvideosinkbin_d3d11";
+#else
+    static constexpr const char *videoSinkBinName = "qgcvideosinkbin";
+#endif
+
+    GstElement *videoSinkBin = gst_element_factory_make(videoSinkBinName, NULL);
     if (videoSinkBin) {
         if (widget) {
             g_object_set(videoSinkBin, "widget", widget, NULL);
         }
     } else {
-        qCCritical(GStreamerLog) << "gst_element_factory_make('qgcvideosinkbin') failed";
+        qCCritical(GStreamerLog) << QStringLiteral("gst_element_factory_make('%1') failed").arg(videoSinkBinName);
     }
 
     return videoSinkBin;

src/VideoManager/VideoReceiver/GStreamer/gstqgc/CMakeLists.txt

@@ -7,4 +7,12 @@ target_sources(${CMAKE_PROJECT_NAME}
         gstqgcvideosinkbin.h
 )
 
+if(WIN32)
+    target_sources(${CMAKE_PROJECT_NAME}
+        PRIVATE
+            gstqgcvideosinkbin_d3d11.cc
+            gstqgcvideosinkbin_d3d11.h
+    )
+endif()
+
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

src/VideoManager/VideoReceiver/GStreamer/gstqgc/gstqgcvideosinkbin.cc

@@ -156,14 +156,14 @@ gst_qgc_video_sink_bin_init(GstQgcVideoSinkBin *self)
         return;
     }
 
-    self->qmlglsink = gst_element_factory_make("qml6glsink", NULL);
-    if (!self->qmlglsink) {
+    self->qml6glsink = gst_element_factory_make("qml6glsink", NULL);
+    if (!self->qml6glsink) {
         GST_ERROR_OBJECT(self, "gst_element_factory_make('qml6glsink') failed");
         return;
     }
 
     g_object_set(self->glsinkbin,
-                 "sink", self->qmlglsink,
+                 "sink", self->qml6glsink,
                  PROP_ENABLE_LAST_SAMPLE_NAME, FALSE,
                  NULL);
 
@@ -209,7 +209,7 @@ gst_qgc_video_sink_bin_set_property(GObject *object, guint prop_id, const GValue
                      NULL);
         break;
     case PROP_WIDGET:
-        g_object_set(self->qmlglsink,
+        g_object_set(self->qml6glsink,
                      PROP_WIDGET_NAME,
                      g_value_get_pointer(value),
                      NULL);
@@ -223,7 +223,7 @@ gst_qgc_video_sink_bin_set_property(GObject *object, guint prop_id, const GValue
     case PROP_PIXEL_ASPECT_RATIO: {
         const gint num = gst_value_get_fraction_numerator(value);
         const gint den = gst_value_get_fraction_denominator(value);
-        g_object_set(self->qmlglsink,
+        g_object_set(self->qml6glsink,
                      PROP_PIXEL_ASPECT_RATIO_NAME,
                      num,
                      den,
@@ -271,7 +271,7 @@ gst_qgc_video_sink_bin_get_property(GObject *object, guint prop_id, GValue *valu
     }
     case PROP_WIDGET: {
         gpointer widget = NULL;
-        g_object_get(self->qmlglsink,
+        g_object_get(self->qml6glsink,
                      PROP_WIDGET_NAME,
                      &widget,
                      NULL);
@@ -289,7 +289,7 @@ gst_qgc_video_sink_bin_get_property(GObject *object, guint prop_id, GValue *valu
     }
     case PROP_PIXEL_ASPECT_RATIO: {
         gint num = 0, den = 1;
-        g_object_get(self->qmlglsink,
+        g_object_get(self->qml6glsink,
                      PROP_PIXEL_ASPECT_RATIO_NAME,
                      &num, &den,
                      NULL);
@@ -318,13 +318,13 @@ gst_qgc_video_sink_bin_on_glsinkbin_create_element(GstElement *object, gpointer
     GstQgcVideoSinkBin *qgcVideoSinkBin = GST_QGC_VIDEO_SINK_BIN(udata);
 
     qgcVideoSinkBin->glsinkbin = GST_ELEMENT(glsinkbin);
-    qgcVideoSinkBin->qmlglsink = gst_element_factory_make("qml6glsink", NULL);
-    if (!qgcVideoSinkBin->qmlglsink) {
+    qgcVideoSinkBin->qml6glsink = gst_element_factory_make("qml6glsink", NULL);
+    if (!qgcVideoSinkBin->qml6glsink) {
         GST_ERROR_OBJECT(qgcVideoSinkBin, "gst_element_factory_make('qml6glsink') failed");
-        g_signal_emit(GST_ELEMENT(qgcVideoSinkBin), gst_qgc_video_sink_bin_signals[SIGNAL_CREATE_ELEMENT], 0, &qgcVideoSinkBin->qmlglsink);
+        g_signal_emit(GST_ELEMENT(qgcVideoSinkBin), gst_qgc_video_sink_bin_signals[SIGNAL_CREATE_ELEMENT], 0, &qgcVideoSinkBin->qml6glsink);
     }
 
-    return qgcVideoSinkBin->qmlglsink;
+    return qgcVideoSinkBin->qml6glsink;
 }
 
 static void

src/VideoManager/VideoReceiver/GStreamer/gstqgc/gstqgcvideosinkbin.h

@@ -20,7 +20,7 @@ struct _GstQgcVideoSinkBin
 {
     GstBin parent;
     GstElement *glsinkbin;
-    GstElement *qmlglsink;
+    GstElement *qml6glsink;
 };
 
 G_END_DECLS