mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 13:56:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

examples/gstplay/Makefile.am: Adding the interface library.

Browse source 
Original commit message from CVS:
* examples/gstplay/Makefile.am: Adding the interface library.
* gst-libs/gst/play/Makefile.am: Adding the interface library.
* gst-libs/gst/play/gstplay.c: (gst_play_set_video_sink): Connecting tothe XOverlay size signal instead of GstVideoSink.
* gst-libs/gst/play/gstplay.h: Including the XOverlay interface to check        GST_IS_X_OVERLAY before signal connect.
* gst-libs/gst/video/gstvideosink.c: (gst_videosink_class_init):
Removing the have_video_size signal.
* gst-libs/gst/video/gstvideosink.h: Removing the have_video_size signal        and associated public method.
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents),
(gst_ximagesink_sinkconnect): Using XOverlay public method to fire size
signal.
* sys/xvideo/xvideosink.c: (gst_xvideosink_sinkconnect),
(gst_xvideosink_xwindow_new): Using XOverlay public method to fire size
signal.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sinkconnect):
Using XOverlay public method to fire size signal.
This commit is contained in:
Julien Moutte 2004-01-07 21:49:25 +00:00
parent ee7f05f8da
commit 2a35e3393f
13 changed files with 43 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,23 @@
2004-01-07 Julien MOUTTE <julien@moutte.net>
* examples/gstplay/Makefile.am: Adding the interface library.
* gst-libs/gst/play/Makefile.am: Adding the interface library.
* gst-libs/gst/play/gstplay.c: (gst_play_set_video_sink): Connecting to the XOverlay size signal instead of GstVideoSink.
* gst-libs/gst/play/gstplay.h: Including the XOverlay interface to check
GST_IS_X_OVERLAY before signal connect.
* gst-libs/gst/video/gstvideosink.c: (gst_videosink_class_init):
Removing the have_video_size signal.
* gst-libs/gst/video/gstvideosink.h: Removing the have_video_size signal
and associated public method.
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents),
(gst_ximagesink_sinkconnect): Using XOverlay public method to fire size
signal.
* sys/xvideo/xvideosink.c: (gst_xvideosink_sinkconnect),
(gst_xvideosink_xwindow_new): Using XOverlay public method to fire size
signal.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sinkconnect):
Using XOverlay public method to fire size signal.
2004-01-07 David Schleef <ds@schleef.org> 2004-01-07 David Schleef <ds@schleef.org>
* gst/videofilter/Makefile.am: * gst/videofilter/Makefile.am:

3
examples/gstplay/Makefile.am
View file

@ -5,5 +5,6 @@ player_SOURCES = player.c
player_CFLAGS = $(GST_CFLAGS) player_CFLAGS = $(GST_CFLAGS)
player_LDFLAGS = \ player_LDFLAGS = \
$(GST_LIBS) \ $(GST_LIBS) \
$(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la

5
gst-libs/gst/play/Makefile.am
View file

@ -8,7 +8,10 @@ libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@
libgstplay_@GST_MAJORMINOR@include_HEADERS = gstplay.h libgstplay_@GST_MAJORMINOR@include_HEADERS = gstplay.h
libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
libgstplay_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_LIBS) $(GST_CONTROL_LIBS) libgstplay_@GST_MAJORMINOR@_la_LIBADD =
$(GST_LIBS) $(GST_PLUGINS_LIBS) \
$(GST_CONTROL_LIBS) \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = \ libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = \
-version-info @GST_PLUGINS_LIBVERSION@ -version-info @GST_PLUGINS_LIBVERSION@

7
gst-libs/gst/play/gstplay.c
View file

@ -685,8 +685,11 @@ gst_play_set_video_sink (GstPlay *play, GstElement *video_sink)
if (GST_IS_ELEMENT (video_sink_element)) { if (GST_IS_ELEMENT (video_sink_element)) {
g_hash_table_replace (play->priv->elements, "video_sink_element", g_hash_table_replace (play->priv->elements, "video_sink_element",
video_sink_element); video_sink_element);
g_signal_connect (G_OBJECT (video_sink_element), "have_video_size", if (GST_IS_X_OVERLAY (video_sink_element)) {
G_CALLBACK (gst_play_have_video_size), play); g_signal_connect (G_OBJECT (video_sink_element),
"desired_size_changed",
G_CALLBACK (gst_play_have_video_size), play);
}
} }
gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play))); gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play)));

1
gst-libs/gst/play/gstplay.h
View file

@ -21,6 +21,7 @@
#define __GST_PLAY_H__ #define __GST_PLAY_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/xoverlay/xoverlay.h>
#define GST_TYPE_PLAY (gst_play_get_type()) #define GST_TYPE_PLAY (gst_play_get_type())
#define GST_PLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay)) #define GST_PLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay))

7
gst-libs/gst/play/play.c
View file

@ -685,8 +685,11 @@ gst_play_set_video_sink (GstPlay *play, GstElement *video_sink)
if (GST_IS_ELEMENT (video_sink_element)) { if (GST_IS_ELEMENT (video_sink_element)) {
g_hash_table_replace (play->priv->elements, "video_sink_element", g_hash_table_replace (play->priv->elements, "video_sink_element",
video_sink_element); video_sink_element);
g_signal_connect (G_OBJECT (video_sink_element), "have_video_size", if (GST_IS_X_OVERLAY (video_sink_element)) {
G_CALLBACK (gst_play_have_video_size), play); g_signal_connect (G_OBJECT (video_sink_element),
"desired_size_changed",
G_CALLBACK (gst_play_have_video_size), play);
}
} }
gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play))); gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play)));

1
gst-libs/gst/play/play.h
View file

@ -21,6 +21,7 @@
#define __GST_PLAY_H__ #define __GST_PLAY_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/xoverlay/xoverlay.h>
#define GST_TYPE_PLAY (gst_play_get_type()) #define GST_TYPE_PLAY (gst_play_get_type())
#define GST_PLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay)) #define GST_PLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay))

37
gst-libs/gst/video/gstvideosink.c
View file

@ -24,15 +24,7 @@
#include "gstvideosink.h" #include "gstvideosink.h"
/* VideoSink signals and args */
enum {
HAVE_VIDEO_SIZE,
LAST_SIGNAL
};
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
static guint gst_videosink_signals[LAST_SIGNAL] = { 0 };
/* Private methods */ /* Private methods */
@ -67,40 +59,11 @@ gst_videosink_class_init (GstVideoSinkClass *klass)
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
gst_videosink_signals[HAVE_VIDEO_SIZE] =
g_signal_new ("have_video_size",
G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstVideoSinkClass, have_video_size),
NULL, NULL,
gst_marshal_VOID__INT_INT, G_TYPE_NONE, 2,
G_TYPE_UINT, G_TYPE_UINT);
gstelement_class->set_clock = gst_videosink_set_clock; gstelement_class->set_clock = gst_videosink_set_clock;
} }
/* Public methods */ /* Public methods */
/**
* gst_video_sink_got_video_size:
* @videosink: a #GstVideoSink which received video geometry.
* @width: a width as a #gint.
* @height: a height as a #gint.
*
* This will fire an have_size signal and update the internal object's
* geometry.
*
* This function should be used by video sink developpers.
*/
void
gst_video_sink_got_video_size (GstVideoSink *videosink, gint width, gint height)
{
g_return_if_fail (videosink != NULL);
g_return_if_fail (GST_IS_VIDEOSINK (videosink));
g_signal_emit (G_OBJECT (videosink), gst_videosink_signals[HAVE_VIDEO_SIZE],
0, width, height);
}
GType GType
gst_videosink_get_type (void) gst_videosink_get_type (void)
{ {

7
gst-libs/gst/video/gstvideosink.h
View file

@ -62,18 +62,11 @@ struct _GstVideoSink {
struct _GstVideoSinkClass { struct _GstVideoSinkClass {
GstElementClass parent_class; GstElementClass parent_class;
/* signals */
void (*have_video_size) (GstVideoSink *element, gint width, gint height);
gpointer _gst_reserved[GST_PADDING]; gpointer _gst_reserved[GST_PADDING];
}; };
GType gst_videosink_get_type (void); GType gst_videosink_get_type (void);
/* public methods to fire signals */
void gst_video_sink_got_video_size (GstVideoSink *videosink,
gint width, gint height);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

7
gst-libs/gst/video/videosink.h
View file

@ -62,18 +62,11 @@ struct _GstVideoSink {
struct _GstVideoSinkClass { struct _GstVideoSinkClass {
GstElementClass parent_class; GstElementClass parent_class;
/* signals */
void (*have_video_size) (GstVideoSink *element, gint width, gint height);
gpointer _gst_reserved[GST_PADDING]; gpointer _gst_reserved[GST_PADDING];
}; };
GType gst_videosink_get_type (void); GType gst_videosink_get_type (void);
/* public methods to fire signals */
void gst_video_sink_got_video_size (GstVideoSink *videosink,
gint width, gint height);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

5
sys/ximage/ximagesink.c
View file

@ -356,7 +356,7 @@ gst_ximagesink_handle_xevents (GstXImageSink *ximagesink, GstPad *pad)
GST_VIDEOSINK_HEIGHT (ximagesink)); GST_VIDEOSINK_HEIGHT (ximagesink));
} }
gst_video_sink_got_video_size (GST_VIDEOSINK (ximagesink), gst_x_overlay_got_desired_size (GST_X_OVERLAY (ximagesink),
GST_VIDEOSINK_WIDTH (ximagesink), GST_VIDEOSINK_WIDTH (ximagesink),
GST_VIDEOSINK_HEIGHT (ximagesink)); GST_VIDEOSINK_HEIGHT (ximagesink));
} }
@ -653,9 +653,6 @@ gst_ximagesink_sinkconnect (GstPad *pad, const GstCaps *caps)
gst_x_overlay_got_desired_size (GST_X_OVERLAY (ximagesink), gst_x_overlay_got_desired_size (GST_X_OVERLAY (ximagesink),
GST_VIDEOSINK_WIDTH (ximagesink), GST_VIDEOSINK_WIDTH (ximagesink),
GST_VIDEOSINK_HEIGHT (ximagesink)); GST_VIDEOSINK_HEIGHT (ximagesink));
gst_video_sink_got_video_size (GST_VIDEOSINK (ximagesink),
GST_VIDEOSINK_WIDTH (ximagesink),
GST_VIDEOSINK_HEIGHT (ximagesink));
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }

3
sys/xvimage/xvimagesink.c
View file

@ -809,9 +809,6 @@ gst_xvimagesink_sinkconnect (GstPad *pad, const GstCaps *caps)
gst_x_overlay_got_desired_size (GST_X_OVERLAY (xvimagesink), gst_x_overlay_got_desired_size (GST_X_OVERLAY (xvimagesink),
GST_VIDEOSINK_WIDTH (xvimagesink), GST_VIDEOSINK_WIDTH (xvimagesink),
GST_VIDEOSINK_HEIGHT (xvimagesink)); GST_VIDEOSINK_HEIGHT (xvimagesink));
gst_video_sink_got_video_size (GST_VIDEOSINK (xvimagesink),
GST_VIDEOSINK_WIDTH (xvimagesink),
GST_VIDEOSINK_HEIGHT (xvimagesink));
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }

3
tests/old/examples/gstplay/Makefile.am
View file

@ -5,5 +5,6 @@ player_SOURCES = player.c
player_CFLAGS = $(GST_CFLAGS) player_CFLAGS = $(GST_CFLAGS)
player_LDFLAGS = \ player_LDFLAGS = \
$(GST_LIBS) \ $(GST_LIBS) \
$(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la