mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-03 05:05:52 +00:00
docs: fix up some more GstXOverlay -> GstVideoOverlay
https://bugzilla.gnome.org/show_bug.cgi?id=689740
This commit is contained in:
parent
0bb5c6c012
commit
e05abf0ef1
|
@ -141,7 +141,7 @@
|
||||||
* <title>GstVideoOverlay and Gtk+</title>
|
* <title>GstVideoOverlay and Gtk+</title>
|
||||||
* <para>
|
* <para>
|
||||||
* |[
|
* |[
|
||||||
* #include <gst/video/xoverlay.h>
|
* #include <gst/video/videooverlay.h>
|
||||||
* #include <gtk/gtk.h>
|
* #include <gtk/gtk.h>
|
||||||
* #ifdef GDK_WINDOWING_X11
|
* #ifdef GDK_WINDOWING_X11
|
||||||
* #include <gdk/gdkx.h> // for GDK_WINDOW_XID
|
* #include <gdk/gdkx.h> // for GDK_WINDOW_XID
|
||||||
|
@ -160,11 +160,11 @@
|
||||||
* return GST_BUS_PASS;
|
* return GST_BUS_PASS;
|
||||||
*
|
*
|
||||||
* if (video_window_handle != 0) {
|
* if (video_window_handle != 0) {
|
||||||
* GstXOverlay *xoverlay;
|
* GstVideoOverlay *overlay;
|
||||||
*
|
*
|
||||||
* // GST_MESSAGE_SRC (message) will be the video sink element
|
* // GST_MESSAGE_SRC (message) will be the video sink element
|
||||||
* xoverlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message));
|
* overlay = GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message));
|
||||||
* gst_x_overlay_set_window_handle (xoverlay, video_window_handle);
|
* gst_video_overlay_set_window_handle (overlay, video_window_handle);
|
||||||
* } else {
|
* } else {
|
||||||
* g_warning ("Should have obtained video_window_handle by now!");
|
* g_warning ("Should have obtained video_window_handle by now!");
|
||||||
* }
|
* }
|
||||||
|
@ -339,7 +339,7 @@ gst_video_overlay_get_type (void)
|
||||||
* @handle: a handle referencing the window.
|
* @handle: a handle referencing the window.
|
||||||
*
|
*
|
||||||
* This will call the video overlay's set_window_handle method. You
|
* This will call the video overlay's set_window_handle method. You
|
||||||
* should use this method to tell to a XOverlay to display video output to a
|
* should use this method to tell to an overlay to display video output to a
|
||||||
* specific window (e.g. an XWindow on X11). Passing 0 as the @handle will
|
* specific window (e.g. an XWindow on X11). Passing 0 as the @handle will
|
||||||
* tell the overlay to stop using that window and create an internal one.
|
* tell the overlay to stop using that window and create an internal one.
|
||||||
*/
|
*/
|
||||||
|
@ -441,7 +441,7 @@ gst_video_overlay_expose (GstVideoOverlay * overlay)
|
||||||
* events are forwarded upstream as navigation events. In some window system,
|
* events are forwarded upstream as navigation events. In some window system,
|
||||||
* events are not propagated in the window hierarchy if a client is listening
|
* events are not propagated in the window hierarchy if a client is listening
|
||||||
* for them. This method allows you to disable events handling completely
|
* for them. This method allows you to disable events handling completely
|
||||||
* from the XOverlay.
|
* from the #GstVideoOverlay.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
gst_video_overlay_handle_events (GstVideoOverlay * overlay,
|
gst_video_overlay_handle_events (GstVideoOverlay * overlay,
|
||||||
|
|
|
@ -118,7 +118,7 @@ struct _GstXContext
|
||||||
* @width: the width in pixels of Window @win
|
* @width: the width in pixels of Window @win
|
||||||
* @height: the height in pixels of Window @win
|
* @height: the height in pixels of Window @win
|
||||||
* @internal: used to remember if Window @win was created internally or passed
|
* @internal: used to remember if Window @win was created internally or passed
|
||||||
* through the #GstXOverlay interface
|
* through the #GstVideoOverlay interface
|
||||||
* @gc: the Graphical Context of Window @win
|
* @gc: the Graphical Context of Window @win
|
||||||
*
|
*
|
||||||
* Structure used to store informations about a Window.
|
* Structure used to store informations about a Window.
|
||||||
|
@ -147,7 +147,7 @@ struct _GstXWindow
|
||||||
* @x_lock: used to protect X calls as we are not using the XLib in threaded
|
* @x_lock: used to protect X calls as we are not using the XLib in threaded
|
||||||
* mode
|
* mode
|
||||||
* @flow_lock: used to protect data flow routines from external calls such as
|
* @flow_lock: used to protect data flow routines from external calls such as
|
||||||
* events from @event_thread or methods from the #GstXOverlay interface
|
* events from @event_thread or methods from the #GstVideoOverlay interface
|
||||||
* @par: used to override calculated pixel aspect ratio from @xcontext
|
* @par: used to override calculated pixel aspect ratio from @xcontext
|
||||||
* @pool_lock: used to protect the buffer pool
|
* @pool_lock: used to protect the buffer pool
|
||||||
* @buffer_pool: a list of #GstXImageBuffer that could be reused at next buffer
|
* @buffer_pool: a list of #GstXImageBuffer that could be reused at next buffer
|
||||||
|
|
|
@ -25,9 +25,10 @@
|
||||||
* using the XVideo extension. Rendering to a remote display is theoretically
|
* using the XVideo extension. Rendering to a remote display is theoretically
|
||||||
* possible but i doubt that the XVideo extension is actually available when
|
* possible but i doubt that the XVideo extension is actually available when
|
||||||
* connecting to a remote display. This element can receive a Window ID from the
|
* connecting to a remote display. This element can receive a Window ID from the
|
||||||
* application through the XOverlay interface and will then render video frames
|
* application through the #GstVideoOverlay interface and will then render
|
||||||
* in this drawable. If no Window ID was provided by the application, the
|
* video frames in this drawable. If no Window ID was provided by the
|
||||||
* element will create its own internal window and render into it.
|
* application, the element will create its own internal window and render
|
||||||
|
* into it.
|
||||||
*
|
*
|
||||||
* <refsect2>
|
* <refsect2>
|
||||||
* <title>Scaling</title>
|
* <title>Scaling</title>
|
||||||
|
|
|
@ -140,7 +140,7 @@ struct _GstXContext
|
||||||
* @width: the width in pixels of Window @win
|
* @width: the width in pixels of Window @win
|
||||||
* @height: the height in pixels of Window @win
|
* @height: the height in pixels of Window @win
|
||||||
* @internal: used to remember if Window @win was created internally or passed
|
* @internal: used to remember if Window @win was created internally or passed
|
||||||
* through the #GstXOverlay interface
|
* through the #GstVideoOverlay interface
|
||||||
* @gc: the Graphical Context of Window @win
|
* @gc: the Graphical Context of Window @win
|
||||||
*
|
*
|
||||||
* Structure used to store informations about a Window.
|
* Structure used to store informations about a Window.
|
||||||
|
@ -182,7 +182,7 @@ struct _GstXvImageFormat
|
||||||
* @x_lock: used to protect X calls as we are not using the XLib in threaded
|
* @x_lock: used to protect X calls as we are not using the XLib in threaded
|
||||||
* mode
|
* mode
|
||||||
* @flow_lock: used to protect data flow routines from external calls such as
|
* @flow_lock: used to protect data flow routines from external calls such as
|
||||||
* events from @event_thread or methods from the #GstXOverlay interface
|
* events from @event_thread or methods from the #GstVideoOverlay interface
|
||||||
* @par: used to override calculated pixel aspect ratio from @xcontext
|
* @par: used to override calculated pixel aspect ratio from @xcontext
|
||||||
* @pool_lock: used to protect the buffer pool
|
* @pool_lock: used to protect the buffer pool
|
||||||
* @image_pool: a list of #GstXvImageBuffer that could be reused at next buffer
|
* @image_pool: a list of #GstXvImageBuffer that could be reused at next buffer
|
||||||
|
|
|
@ -119,7 +119,7 @@ main (int argc, char **argv)
|
||||||
g_signal_connect (G_OBJECT (window), "delete-event",
|
g_signal_connect (G_OBJECT (window), "delete-event",
|
||||||
G_CALLBACK (window_closed), (gpointer) pipeline);
|
G_CALLBACK (window_closed), (gpointer) pipeline);
|
||||||
gtk_window_set_default_size (GTK_WINDOW (window), 320, 240);
|
gtk_window_set_default_size (GTK_WINDOW (window), 320, 240);
|
||||||
gtk_window_set_title (GTK_WINDOW (window), "GstXOverlay Gtk+ demo");
|
gtk_window_set_title (GTK_WINDOW (window), "GstVideoOverlay Gtk+ demo");
|
||||||
|
|
||||||
video_window = gtk_drawing_area_new ();
|
video_window = gtk_drawing_area_new ();
|
||||||
gtk_widget_set_double_buffered (video_window, FALSE);
|
gtk_widget_set_double_buffered (video_window, FALSE);
|
||||||
|
|
|
@ -100,7 +100,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
QWidget window;
|
QWidget window;
|
||||||
window.resize(320, 240);
|
window.resize(320, 240);
|
||||||
window.setWindowTitle("GstXOverlay Qt demo");
|
window.setWindowTitle("GstVideoOverlay Qt demo");
|
||||||
window.show();
|
window.show();
|
||||||
|
|
||||||
WId xwinid = window.winId();
|
WId xwinid = window.winId();
|
||||||
|
|
|
@ -113,7 +113,7 @@ int main( int argc, char **argv )
|
||||||
|
|
||||||
QGraphicsView view( &scene );
|
QGraphicsView view( &scene );
|
||||||
view.resize(320, 240);
|
view.resize(320, 240);
|
||||||
view.setWindowTitle("GstXOverlay Qt GraphicsView demo");
|
view.setWindowTitle("GstVideoOverlay Qt GraphicsView demo");
|
||||||
view.show();
|
view.show();
|
||||||
|
|
||||||
gst_init (&argc, &argv);
|
gst_init (&argc, &argv);
|
||||||
|
|
|
@ -2118,7 +2118,7 @@ realize_cb (GtkWidget * widget, PlaybackApp * app)
|
||||||
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
||||||
* as well */
|
* as well */
|
||||||
if (!gdk_window_ensure_native (window))
|
if (!gdk_window_ensure_native (window))
|
||||||
g_error ("Couldn't create native window needed for GstXOverlay!");
|
g_error ("Couldn't create native window needed for GstVideoOverlay!");
|
||||||
|
|
||||||
#if defined (GDK_WINDOWING_WIN32)
|
#if defined (GDK_WINDOWING_WIN32)
|
||||||
app->embed_xid = GDK_WINDOW_HWND (window);
|
app->embed_xid = GDK_WINDOW_HWND (window);
|
||||||
|
|
|
@ -2476,7 +2476,7 @@ realize_cb (GtkWidget * widget, gpointer data)
|
||||||
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
||||||
* as well */
|
* as well */
|
||||||
if (!gdk_window_ensure_native (window))
|
if (!gdk_window_ensure_native (window))
|
||||||
g_error ("Couldn't create native window needed for GstXOverlay!");
|
g_error ("Couldn't create native window needed for GstVideoOverlay!");
|
||||||
|
|
||||||
#ifdef HAVE_X
|
#ifdef HAVE_X
|
||||||
embed_xid = GDK_WINDOW_XID (window);
|
embed_xid = GDK_WINDOW_XID (window);
|
||||||
|
|
|
@ -99,7 +99,7 @@ realize_cb (GtkWidget * widget, gpointer data)
|
||||||
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
/* This is here just for pedagogical purposes, GDK_WINDOW_XID will call it
|
||||||
* as well */
|
* as well */
|
||||||
if (!gdk_window_ensure_native (window))
|
if (!gdk_window_ensure_native (window))
|
||||||
g_error ("Couldn't create native window needed for GstXOverlay!");
|
g_error ("Couldn't create native window needed for GstVideoOverlay!");
|
||||||
|
|
||||||
embed_xid = GDK_WINDOW_XID (window);
|
embed_xid = GDK_WINDOW_XID (window);
|
||||||
g_print ("Window realize: video window XID = %lu\n", embed_xid);
|
g_print ("Window realize: video window XID = %lu\n", embed_xid);
|
||||||
|
|
Loading…
Reference in a new issue