diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index f4ecb0a9a7..626a23bdeb 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -135,6 +135,8 @@ + + @@ -348,6 +350,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 26fd54ba89..dc7569dd9c 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -1833,6 +1833,38 @@ GST_TYPE_PUSH_FILE_SRC gst_push_file_src_get_type +
+element-qmlglsink +qmlglsink +GstQtSink + +GstQtSinkClass +GST_QT_SINK +GST_QT_SINK_CAST +GST_IS_QT_SINK +GST_QT_SINK_CLASS +GST_IS_QT_SINK_CLASS +GST_TYPE_QT_SINK + +gst_qt_sink_get_type +
+ +
+element-qmlglsrc +qmlglsrc +GstQtSrc + +GstQtSrcClass +GST_QT_SRC +GST_QT_SRC_CAST +GST_IS_QT_SRC +GST_QT_SRC_CLASS +GST_IS_QT_SRC_CLASS +GST_TYPE_QT_SRC + +gst_qt_src_get_type +
+
element-qtdemux qtdemux diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index 77419506c6..96a09bcb75 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -24588,3 +24588,53 @@ FALSE + +GstQtSrc::use-default-fbo +gboolean + +rw +Whether to use default FBO +When set it will not create a new FBO for the QML render thread. +FALSE + + + +GstQtSrc::window +gpointer + +rw +QQuickWindow +The QQuickWindow to place in the object hierarchy. + + + + +GstQtSink::force-aspect-ratio +gboolean + +rw +Force aspect ratio +When enabled, scaling will respect original aspect ratio. +TRUE + + + +GstQtSink::pixel-aspect-ratio +GstFraction + +rw +Pixel Aspect Ratio +The pixel aspect ratio of the device. + + + + +GstQtSink::widget +gpointer + +rw +QQuickItem +The QQuickItem to place in the object hierarchy. + + + diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy index 046acaa374..9a43e0fd8e 100644 --- a/docs/plugins/gst-plugins-good-plugins.hierarchy +++ b/docs/plugins/gst-plugins-good-plugins.hierarchy @@ -77,6 +77,7 @@ GObject GstGtkBaseSink GstGtkGLSink GstGtkSink + GstQtSink GstV4l2Sink GstBaseSrc GstDTMFSrc @@ -90,6 +91,7 @@ GObject GstDV1394Src GstHDV1394Src GstMultiFileSrc + GstQtSrc GstSoupHTTPSrc GstUDPSrc GstV4l2Src diff --git a/docs/plugins/inspect/plugin-qmlgl.xml b/docs/plugins/inspect/plugin-qmlgl.xml new file mode 100644 index 0000000000..5da7b09b49 --- /dev/null +++ b/docs/plugins/inspect/plugin-qmlgl.xml @@ -0,0 +1,43 @@ + + qmlgl + Qt gl plugin + ../../ext/qt/.libs/libgstqmlgl.so + libgstqmlgl.so + 1.13.0.1 + LGPL + gst-plugins-good + GStreamer Good Plug-ins git + Unknown package origin + + + qmlglsink + Qt Video Sink + Sink/Video + A video sink that renders to a QQuickItem + Matthew Waters <matthew@centricular.com> + + + sink + sink + always +
video/x-raw(memory:GLMemory), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ], texture-target=(string)2D
+
+
+
+ + qmlglsrc + Qt Video Source + Source/Video + A video src that captures a window from a QML view + Multimedia Team <shmmmw@freescale.com> + + + src + source + always +
video/x-raw(memory:GLMemory), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ], texture-target=(string)2D
+
+
+
+
+
\ No newline at end of file