mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
/GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
Original commit message from CVS: /GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
This commit is contained in:
parent
805130e62c
commit
dc35dbb595
23 changed files with 84 additions and 73 deletions
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit b7abb510aa14e8692df39ea8c2c758e37d8a8d8a
|
||||
Subproject commit e903f88a7388f0b463204ea1f960a4ace840175b
|
|
@ -700,7 +700,7 @@ sink_restart:
|
|||
g_assert (this->pad[i] != NULL);
|
||||
while (sink->size[i] == 0) {
|
||||
if (!sink->buf[i])
|
||||
sink->buf[i] = gst_pad_pull (this->pad[i]);
|
||||
sink->buf[i] = GST_BUFFER (gst_pad_pull (this->pad[i]));
|
||||
if (GST_IS_EVENT (sink->buf[i])) {
|
||||
if (gst_alsa_sink_check_event (sink, i))
|
||||
continue;
|
||||
|
@ -1125,7 +1125,7 @@ gst_alsa_src_loop (GstElement *element)
|
|||
GST_BUFFER_SIZE (src->buf[i]) = gst_alsa_samples_to_bytes (this, copied);
|
||||
GST_BUFFER_TIMESTAMP (src->buf[i]) = gst_alsa_samples_to_timestamp (this, this->transmitted);
|
||||
GST_BUFFER_DURATION (src->buf[i]) = gst_alsa_samples_to_timestamp (this, copied);
|
||||
gst_pad_push (this->pad[i], src->buf[i]);
|
||||
gst_pad_push (this->pad[i], GST_DATA (src->buf[i]));
|
||||
src->buf[i] = NULL;
|
||||
}
|
||||
this->transmitted += copied;
|
||||
|
|
|
@ -145,7 +145,7 @@ static void cdparanoia_set_property (GObject *object, guint prop_id,
|
|||
static void cdparanoia_get_property (GObject *object, guint prop_id,
|
||||
GValue *value, GParamSpec *pspec);
|
||||
|
||||
static GstBuffer* cdparanoia_get (GstPad *pad);
|
||||
static GstData* cdparanoia_get (GstPad *pad);
|
||||
static gboolean cdparanoia_event (GstPad *pad, GstEvent *event);
|
||||
static const GstEventMask*
|
||||
cdparanoia_get_event_mask (GstPad *pad);
|
||||
|
@ -440,7 +440,7 @@ cdparanoia_callback (long inpos, int function)
|
|||
{
|
||||
}
|
||||
|
||||
static GstBuffer *
|
||||
static GstData *
|
||||
cdparanoia_get (GstPad *pad)
|
||||
{
|
||||
CDParanoia *src;
|
||||
|
@ -483,7 +483,7 @@ cdparanoia_get (GstPad *pad)
|
|||
}
|
||||
|
||||
/* we're done, push the buffer off now */
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
/* need some stuff to get a discid (cdparanoia doesn't do cddb but lets
|
||||
|
|
|
@ -112,7 +112,7 @@ static void gst_gnomevfssink_get_property (GObject *object, guint prop_id, GValu
|
|||
static gboolean gst_gnomevfssink_open_file (GstGnomeVFSSink *sink);
|
||||
static void gst_gnomevfssink_close_file (GstGnomeVFSSink *sink);
|
||||
|
||||
static void gst_gnomevfssink_chain (GstPad *pad,GstBuffer *buf);
|
||||
static void gst_gnomevfssink_chain (GstPad *pad,GstData *_data);
|
||||
|
||||
static GstElementStateReturn gst_gnomevfssink_change_state (GstElement *element);
|
||||
|
||||
|
@ -306,8 +306,9 @@ gst_gnomevfssink_close_file (GstGnomeVFSSink *sink)
|
|||
* take the buffer from the pad and write to file if it's open
|
||||
*/
|
||||
static void
|
||||
gst_gnomevfssink_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_gnomevfssink_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstGnomeVFSSink *sink;
|
||||
GnomeVFSResult result;
|
||||
GnomeVFSFileSize bytes_written;
|
||||
|
|
|
@ -180,7 +180,7 @@ static void gst_gnomevfssrc_set_property (GObject *object, guint prop_id,
|
|||
static void gst_gnomevfssrc_get_property (GObject *object, guint prop_id,
|
||||
GValue *value, GParamSpec *pspec);
|
||||
|
||||
static GstBuffer* gst_gnomevfssrc_get (GstPad *pad);
|
||||
static GstData* gst_gnomevfssrc_get (GstPad *pad);
|
||||
|
||||
static GstElementStateReturn
|
||||
gst_gnomevfssrc_change_state (GstElement *element);
|
||||
|
@ -919,7 +919,7 @@ gst_gnomevfssrc_get_icy_metadata (GstGnomeVFSSrc *src)
|
|||
*
|
||||
* Push a new buffer from the gnomevfssrc at the current offset.
|
||||
*/
|
||||
static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
||||
static GstData *gst_gnomevfssrc_get(GstPad *pad)
|
||||
{
|
||||
GstGnomeVFSSrc *src;
|
||||
GnomeVFSResult result = 0;
|
||||
|
@ -936,7 +936,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
if ((src->curoffset >= src->size) && (src->size != 0))
|
||||
{
|
||||
gst_element_set_eos (GST_ELEMENT (src));
|
||||
return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
|
||||
return GST_DATA (gst_event_new (GST_EVENT_EOS));
|
||||
}
|
||||
|
||||
/* create the buffer */
|
||||
|
@ -966,7 +966,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
gst_buffer_unref (buf);
|
||||
gst_element_set_eos (GST_ELEMENT (src));
|
||||
src->in_first_get = FALSE;
|
||||
return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
|
||||
return GST_DATA (gst_event_new (GST_EVENT_EOS));
|
||||
}
|
||||
|
||||
src->icy_count += readbytes;
|
||||
|
@ -1000,7 +1000,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
event = gst_event_new_discontinuous (FALSE, GST_FORMAT_BYTES, src->curoffset, NULL);
|
||||
src->need_flush = FALSE;
|
||||
|
||||
return GST_BUFFER (event);
|
||||
return GST_DATA (event);
|
||||
}
|
||||
|
||||
result = gnome_vfs_read(src->handle, GST_BUFFER_DATA(buf),
|
||||
|
@ -1015,7 +1015,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
|
||||
gst_element_set_eos (GST_ELEMENT (src));
|
||||
|
||||
return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
|
||||
return GST_DATA (gst_event_new (GST_EVENT_EOS));
|
||||
}
|
||||
|
||||
GST_BUFFER_OFFSET(buf) = src->curoffset;
|
||||
|
@ -1026,7 +1026,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
GST_BUFFER_TIMESTAMP (buf) = -1;
|
||||
|
||||
/* we're done, return the buffer */
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
/* open the file, do stuff necessary to go to READY state */
|
||||
|
|
|
@ -324,8 +324,9 @@ gst_text_overlay_blit_yuv420(GstTextOverlay *overlay, FT_Bitmap *bitmap,
|
|||
|
||||
|
||||
static void
|
||||
gst_textoverlay_video_chain(GstPad *pad, GstBuffer *buf)
|
||||
gst_textoverlay_video_chain(GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstTextOverlay *overlay;
|
||||
guchar *pixbuf;
|
||||
gint x0, y0;
|
||||
|
@ -368,7 +369,7 @@ gst_textoverlay_video_chain(GstPad *pad, GstBuffer *buf)
|
|||
if (overlay->bitmap.buffer)
|
||||
gst_text_overlay_blit_yuv420(overlay, &overlay->bitmap, pixbuf, x0, y0);
|
||||
|
||||
gst_pad_push(overlay->srcpad, buf);
|
||||
gst_pad_push(overlay->srcpad, GST_DATA (buf));
|
||||
}
|
||||
|
||||
#define PAST_END(buffer, time) \
|
||||
|
@ -388,7 +389,7 @@ gst_textoverlay_loop(GstElement *element)
|
|||
g_return_if_fail(GST_IS_TEXTOVERLAY(element));
|
||||
overlay = GST_TEXTOVERLAY(element);
|
||||
|
||||
video_frame = gst_pad_pull(overlay->video_sinkpad);
|
||||
video_frame = GST_BUFFER (gst_pad_pull(overlay->video_sinkpad));
|
||||
now = GST_BUFFER_TIMESTAMP(video_frame);
|
||||
|
||||
/*
|
||||
|
@ -409,7 +410,7 @@ gst_textoverlay_loop(GstElement *element)
|
|||
if(!GST_PAD_IS_USABLE(overlay->text_sinkpad)){
|
||||
break;
|
||||
}
|
||||
overlay->next_buffer = gst_pad_pull(overlay->text_sinkpad);
|
||||
overlay->next_buffer = GST_BUFFER (gst_pad_pull(overlay->text_sinkpad));
|
||||
if (!overlay->next_buffer)
|
||||
break;
|
||||
|
||||
|
@ -458,7 +459,7 @@ gst_textoverlay_loop(GstElement *element)
|
|||
overlay->need_render = FALSE;
|
||||
}
|
||||
|
||||
gst_textoverlay_video_chain(overlay->srcpad, video_frame);
|
||||
gst_textoverlay_video_chain(overlay->srcpad, GST_DATA (video_frame));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ gst_vorbisenc_get_formats (GstPad *pad)
|
|||
static void gst_vorbisenc_class_init (VorbisEncClass *klass);
|
||||
static void gst_vorbisenc_init (VorbisEnc *vorbisenc);
|
||||
|
||||
static void gst_vorbisenc_chain (GstPad *pad, GstBuffer *buf);
|
||||
static void gst_vorbisenc_chain (GstPad *pad, GstData *_data);
|
||||
static gboolean gst_vorbisenc_setup (VorbisEnc *vorbisenc);
|
||||
|
||||
static void gst_vorbisenc_get_property (GObject *object, guint prop_id,
|
||||
|
@ -656,7 +656,7 @@ gst_vorbisenc_write_page (VorbisEnc *vorbisenc, ogg_page *page)
|
|||
vorbisenc->bytes_out += GST_BUFFER_SIZE (outbuf);
|
||||
|
||||
if (GST_PAD_IS_USABLE (vorbisenc->srcpad)) {
|
||||
gst_pad_push (vorbisenc->srcpad, outbuf);
|
||||
gst_pad_push (vorbisenc->srcpad, GST_DATA (outbuf));
|
||||
}
|
||||
else {
|
||||
gst_buffer_unref (outbuf);
|
||||
|
@ -664,8 +664,9 @@ gst_vorbisenc_write_page (VorbisEnc *vorbisenc, ogg_page *page)
|
|||
}
|
||||
|
||||
static void
|
||||
gst_vorbisenc_chain (GstPad * pad, GstBuffer * buf)
|
||||
gst_vorbisenc_chain (GstPad * pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
VorbisEnc *vorbisenc;
|
||||
|
||||
g_return_if_fail (pad != NULL);
|
||||
|
@ -775,7 +776,7 @@ gst_vorbisenc_chain (GstPad * pad, GstBuffer * buf)
|
|||
vorbis_block_clear (&vorbisenc->vb);
|
||||
vorbis_dsp_clear (&vorbisenc->vd);
|
||||
vorbis_info_clear (&vorbisenc->vi);
|
||||
gst_pad_push (vorbisenc->srcpad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
|
||||
gst_pad_push (vorbisenc->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS)));
|
||||
gst_element_set_eos (GST_ELEMENT (vorbisenc));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -592,7 +592,7 @@ gst_vorbisfile_loop (GstElement *element)
|
|||
/* if the pad is not usable, don't push it out */
|
||||
if (GST_PAD_IS_USABLE (vorbisfile->srcpad)) {
|
||||
gst_pad_push (vorbisfile->srcpad,
|
||||
GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
|
||||
GST_DATA (gst_event_new (GST_EVENT_EOS)));
|
||||
}
|
||||
gst_element_set_eos (element);
|
||||
return;
|
||||
|
@ -621,7 +621,7 @@ gst_vorbisfile_loop (GstElement *element)
|
|||
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time,
|
||||
GST_FORMAT_DEFAULT, samples, NULL);
|
||||
|
||||
gst_pad_push (vorbisfile->srcpad, GST_BUFFER (discont));
|
||||
gst_pad_push (vorbisfile->srcpad, GST_DATA (discont));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -646,7 +646,7 @@ gst_vorbisfile_loop (GstElement *element)
|
|||
}
|
||||
|
||||
if (GST_PAD_IS_USABLE (vorbisfile->srcpad))
|
||||
gst_pad_push (vorbisfile->srcpad, outbuf);
|
||||
gst_pad_push (vorbisfile->srcpad, GST_DATA (outbuf));
|
||||
else
|
||||
gst_buffer_unref (outbuf);
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ static void gst_videofilter_init (GstVideofilter *videofilter);
|
|||
static void gst_videofilter_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
||||
static void gst_videofilter_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
||||
|
||||
static void gst_videofilter_chain (GstPad *pad, GstBuffer *buf);
|
||||
static void gst_videofilter_chain (GstPad *pad, GstData *_data);
|
||||
GstCaps * gst_videofilter_class_get_capslist(GstVideofilterClass *klass);
|
||||
static void gst_videofilter_setup(GstVideofilter *videofilter);
|
||||
|
||||
|
@ -366,8 +366,9 @@ gst_videofilter_postinit (GstVideofilter *videofilter)
|
|||
|
||||
|
||||
static void
|
||||
gst_videofilter_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_videofilter_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstVideofilter *videofilter;
|
||||
guchar *data;
|
||||
gulong size;
|
||||
|
@ -386,7 +387,7 @@ gst_videofilter_chain (GstPad *pad, GstBuffer *buf)
|
|||
size = GST_BUFFER_SIZE(buf);
|
||||
|
||||
if(videofilter->passthru){
|
||||
gst_pad_push(videofilter->srcpad, buf);
|
||||
gst_pad_push(videofilter->srcpad, GST_DATA (buf));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -419,7 +420,7 @@ gst_videofilter_chain (GstPad *pad, GstBuffer *buf)
|
|||
GST_DEBUG ("gst_videofilter_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf),
|
||||
GST_OBJECT_NAME (videofilter));
|
||||
|
||||
gst_pad_push(videofilter->srcpad, outbuf);
|
||||
gst_pad_push(videofilter->srcpad, GST_DATA (outbuf));
|
||||
|
||||
gst_buffer_unref(buf);
|
||||
}
|
||||
|
|
|
@ -556,7 +556,7 @@ gst_adder_loop (GstElement *element)
|
|||
/* send it out */
|
||||
|
||||
GST_DEBUG ("pushing buf_out");
|
||||
gst_pad_push (adder->srcpad, buf_out);
|
||||
gst_pad_push (adder->srcpad, GST_DATA (buf_out));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -112,7 +112,7 @@ static void gst_audio_convert_set_property (GObject *object, guint prop_id, con
|
|||
static void gst_audio_convert_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
||||
|
||||
/* gstreamer functions */
|
||||
static void gst_audio_convert_chain (GstPad *pad, GstBuffer *buf);
|
||||
static void gst_audio_convert_chain (GstPad *pad, GstData *_data);
|
||||
static GstPadLinkReturn gst_audio_convert_link (GstPad *pad, GstCaps *caps);
|
||||
static GstElementStateReturn gst_audio_convert_change_state (GstElement *element);
|
||||
|
||||
|
@ -317,8 +317,9 @@ gst_audio_convert_get_property (GObject *object, guint prop_id, GValue *value, G
|
|||
/*** GSTREAMER FUNCTIONS ******************************************************/
|
||||
|
||||
static void
|
||||
gst_audio_convert_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_audio_convert_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstAudioConvert *this;
|
||||
|
||||
g_return_if_fail(GST_IS_PAD(pad));
|
||||
|
@ -357,7 +358,7 @@ gst_audio_convert_chain (GstPad *pad, GstBuffer *buf)
|
|||
|
||||
buf = gst_audio_convert_buffer_from_default_format (this, buf);
|
||||
|
||||
gst_pad_push (this->src, buf);
|
||||
gst_pad_push (this->src, GST_DATA (buf));
|
||||
}
|
||||
|
||||
static GstPadLinkReturn
|
||||
|
|
|
@ -92,7 +92,7 @@ gst_audioscale_method_get_type (void)
|
|||
static void gst_audioscale_class_init (AudioscaleClass *klass);
|
||||
static void gst_audioscale_init (Audioscale *audioscale);
|
||||
|
||||
static void gst_audioscale_chain (GstPad *pad, GstBuffer *buf);
|
||||
static void gst_audioscale_chain (GstPad *pad, GstData *_data);
|
||||
|
||||
static void gst_audioscale_set_property (GObject * object, guint prop_id,
|
||||
const GValue * value, GParamSpec * pspec);
|
||||
|
@ -313,8 +313,9 @@ gst_audioscale_init (Audioscale *audioscale)
|
|||
}
|
||||
|
||||
static void
|
||||
gst_audioscale_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_audioscale_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
Audioscale *audioscale;
|
||||
guchar *data;
|
||||
gulong size;
|
||||
|
@ -325,7 +326,7 @@ gst_audioscale_chain (GstPad *pad, GstBuffer *buf)
|
|||
|
||||
audioscale = GST_AUDIOSCALE (gst_pad_get_parent (pad));
|
||||
if (audioscale->passthru){
|
||||
gst_pad_push (audioscale->srcpad, buf);
|
||||
gst_pad_push (audioscale->srcpad, GST_DATA (buf));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -339,7 +340,7 @@ gst_audioscale_chain (GstPad *pad, GstBuffer *buf)
|
|||
|
||||
resample_scale (audioscale->resample, data, size);
|
||||
|
||||
gst_pad_push (audioscale->srcpad, audioscale->outbuf);
|
||||
gst_pad_push (audioscale->srcpad, GST_DATA (audioscale->outbuf));
|
||||
|
||||
gst_buffer_unref (buf);
|
||||
}
|
||||
|
|
|
@ -96,7 +96,7 @@ static void gst_sinesrc_populate_sinetable (GstSineSrc *src);
|
|||
static inline void gst_sinesrc_update_table_inc (GstSineSrc *src);
|
||||
static void gst_sinesrc_force_caps (GstSineSrc *src);
|
||||
|
||||
static GstBuffer* gst_sinesrc_get (GstPad *pad);
|
||||
static GstData* gst_sinesrc_get (GstPad *pad);
|
||||
|
||||
static GstElementClass *parent_class = NULL;
|
||||
/*static guint gst_sinesrc_signals[LAST_SIGNAL] = { 0 }; */
|
||||
|
@ -210,7 +210,7 @@ gst_sinesrc_init (GstSineSrc *src)
|
|||
|
||||
}
|
||||
|
||||
static GstBuffer *
|
||||
static GstData *
|
||||
gst_sinesrc_get (GstPad *pad)
|
||||
{
|
||||
GstSineSrc *src;
|
||||
|
@ -278,7 +278,7 @@ gst_sinesrc_get (GstPad *pad)
|
|||
if (src->newcaps) {
|
||||
gst_sinesrc_force_caps(src);
|
||||
}
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -72,7 +72,7 @@ static void gst_tcpsink_init (GstTCPSink *tcpsink);
|
|||
|
||||
static void gst_tcpsink_set_clock (GstElement *element, GstClock *clock);
|
||||
|
||||
static void gst_tcpsink_chain (GstPad *pad,GstBuffer *buf);
|
||||
static void gst_tcpsink_chain (GstPad *pad,GstData *_data);
|
||||
static GstElementStateReturn gst_tcpsink_change_state (GstElement *element);
|
||||
|
||||
static void gst_tcpsink_set_property (GObject *object, guint prop_id,
|
||||
|
@ -246,8 +246,9 @@ gst_tcpsink_init (GstTCPSink *tcpsink)
|
|||
}
|
||||
|
||||
static void
|
||||
gst_tcpsink_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_tcpsink_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstTCPSink *tcpsink;
|
||||
|
||||
g_return_if_fail (pad != NULL);
|
||||
|
|
|
@ -70,7 +70,7 @@ gst_tcpsrc_control_get_type(void) {
|
|||
static void gst_tcpsrc_class_init (GstTCPSrc *klass);
|
||||
static void gst_tcpsrc_init (GstTCPSrc *tcpsrc);
|
||||
|
||||
static GstBuffer* gst_tcpsrc_get (GstPad *pad);
|
||||
static GstData* gst_tcpsrc_get (GstPad *pad);
|
||||
static GstElementStateReturn
|
||||
gst_tcpsrc_change_state (GstElement *element);
|
||||
|
||||
|
@ -167,7 +167,7 @@ gst_tcpsrc_init (GstTCPSrc *tcpsrc)
|
|||
GST_FLAG_UNSET (tcpsrc, GST_TCPSRC_CONNECTED);
|
||||
}
|
||||
|
||||
static GstBuffer*
|
||||
static GstData*
|
||||
gst_tcpsrc_get (GstPad *pad)
|
||||
{
|
||||
GstTCPSrc *tcpsrc;
|
||||
|
@ -264,7 +264,7 @@ gst_tcpsrc_get (GstPad *pad)
|
|||
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
|
||||
current_time, NULL);
|
||||
|
||||
gst_pad_push (tcpsrc->srcpad, GST_BUFFER (discont));
|
||||
gst_pad_push (tcpsrc->srcpad, GST_DATA (discont));
|
||||
}
|
||||
|
||||
GST_FLAG_UNSET (tcpsrc, GST_TCPSRC_1ST_BUF);
|
||||
|
@ -312,7 +312,7 @@ gst_tcpsrc_get (GstPad *pad)
|
|||
outbuf = NULL;
|
||||
}
|
||||
|
||||
return outbuf;
|
||||
return GST_DATA (outbuf);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ static void gst_videoscale_init (GstVideoscale *videoscale);
|
|||
static void gst_videoscale_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
||||
static void gst_videoscale_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
||||
|
||||
static void gst_videoscale_chain (GstPad *pad, GstBuffer *buf);
|
||||
static void gst_videoscale_chain (GstPad *pad, GstData *_data);
|
||||
static GstCaps * gst_videoscale_get_capslist(void);
|
||||
|
||||
static GstElementClass *parent_class = NULL;
|
||||
|
@ -388,8 +388,9 @@ gst_videoscale_init (GstVideoscale *videoscale)
|
|||
|
||||
|
||||
static void
|
||||
gst_videoscale_chain (GstPad *pad, GstBuffer *buf)
|
||||
gst_videoscale_chain (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstVideoscale *videoscale;
|
||||
guchar *data;
|
||||
gulong size;
|
||||
|
@ -408,7 +409,7 @@ gst_videoscale_chain (GstPad *pad, GstBuffer *buf)
|
|||
size = GST_BUFFER_SIZE(buf);
|
||||
|
||||
if(videoscale->passthru){
|
||||
gst_pad_push(videoscale->srcpad, buf);
|
||||
gst_pad_push(videoscale->srcpad, GST_DATA (buf));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -439,7 +440,7 @@ gst_videoscale_chain (GstPad *pad, GstBuffer *buf)
|
|||
GST_DEBUG ("gst_videoscale_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf),
|
||||
GST_OBJECT_NAME (videoscale));
|
||||
|
||||
gst_pad_push(videoscale->srcpad, outbuf);
|
||||
gst_pad_push(videoscale->srcpad, GST_DATA (outbuf));
|
||||
|
||||
gst_buffer_unref(buf);
|
||||
}
|
||||
|
|
|
@ -71,7 +71,7 @@ static void gst_videotestsrc_set_property (GObject * object, guint prop_id,
|
|||
static void gst_videotestsrc_get_property (GObject * object, guint prop_id, GValue * value,
|
||||
GParamSpec * pspec);
|
||||
|
||||
static GstBuffer *gst_videotestsrc_get (GstPad * pad);
|
||||
static GstData *gst_videotestsrc_get (GstPad * pad);
|
||||
|
||||
static GstElementClass *parent_class = NULL;
|
||||
|
||||
|
@ -405,7 +405,7 @@ gst_videotestsrc_init (GstVideotestsrc * videotestsrc)
|
|||
}
|
||||
|
||||
|
||||
static GstBuffer *
|
||||
static GstData *
|
||||
gst_videotestsrc_get (GstPad * pad)
|
||||
{
|
||||
GstVideotestsrc *videotestsrc;
|
||||
|
@ -466,7 +466,7 @@ gst_videotestsrc_get (GstPad * pad)
|
|||
videotestsrc->n_frames++;
|
||||
}
|
||||
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -105,8 +105,8 @@ static void volume_update_mute (const GValue *value, gpointer data);
|
|||
|
||||
static gboolean volume_parse_caps (GstVolume *filter, GstCaps *caps);
|
||||
|
||||
static void volume_chain_float (GstPad *pad, GstBuffer *buf);
|
||||
static void volume_chain_int16 (GstPad *pad, GstBuffer *buf);
|
||||
static void volume_chain_float (GstPad *pad, GstData *_data);
|
||||
static void volume_chain_int16 (GstPad *pad, GstData *_data);
|
||||
|
||||
static GstElementClass *parent_class = NULL;
|
||||
/*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */
|
||||
|
@ -254,8 +254,9 @@ volume_init (GstVolume *filter)
|
|||
}
|
||||
|
||||
static void
|
||||
volume_chain_float (GstPad *pad, GstBuffer *buf)
|
||||
volume_chain_float (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstVolume *filter;
|
||||
GstBuffer *out_buf;
|
||||
gfloat *data;
|
||||
|
@ -278,13 +279,14 @@ volume_chain_float (GstPad *pad, GstBuffer *buf)
|
|||
data[i++] *= filter->real_vol_f;
|
||||
}
|
||||
|
||||
gst_pad_push(filter->srcpad,out_buf);
|
||||
gst_pad_push(filter->srcpad,GST_DATA (out_buf));
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
volume_chain_int16 (GstPad *pad, GstBuffer *buf)
|
||||
volume_chain_int16 (GstPad *pad, GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstVolume *filter;
|
||||
GstBuffer *out_buf;
|
||||
gint16 *data;
|
||||
|
@ -320,7 +322,7 @@ volume_chain_int16 (GstPad *pad, GstBuffer *buf)
|
|||
}
|
||||
}
|
||||
|
||||
gst_pad_push(filter->srcpad,out_buf);
|
||||
gst_pad_push(filter->srcpad,GST_DATA (out_buf));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ static void gst_v4lmjpegsink_init (GstV4lMjpegSink
|
|||
static GstPadLinkReturn gst_v4lmjpegsink_sinkconnect (GstPad *pad,
|
||||
GstCaps *vscapslist);
|
||||
static void gst_v4lmjpegsink_chain (GstPad *pad,
|
||||
GstBuffer *buf);
|
||||
GstData *_data);
|
||||
|
||||
/* get/set gst object functions */
|
||||
static void gst_v4lmjpegsink_set_property (GObject *object,
|
||||
|
@ -257,8 +257,9 @@ gst_v4lmjpegsink_set_clock (GstElement *element, GstClock *clock)
|
|||
|
||||
static void
|
||||
gst_v4lmjpegsink_chain (GstPad *pad,
|
||||
GstBuffer *buf)
|
||||
GstData *_data)
|
||||
{
|
||||
GstBuffer *buf = GST_BUFFER (_data);
|
||||
GstV4lMjpegSink *v4lmjpegsink;
|
||||
GstClockTimeDiff jitter;
|
||||
gint num;
|
||||
|
|
|
@ -77,7 +77,7 @@ static gboolean gst_v4lmjpegsrc_srcconvert (GstPad *pad,
|
|||
gint64 *dest_value);
|
||||
static GstPadLinkReturn gst_v4lmjpegsrc_srcconnect (GstPad *pad,
|
||||
GstCaps *caps);
|
||||
static GstBuffer* gst_v4lmjpegsrc_get (GstPad *pad);
|
||||
static GstData* gst_v4lmjpegsrc_get (GstPad *pad);
|
||||
static GstCaps* gst_v4lmjpegsrc_getcaps (GstPad *pad,
|
||||
GstCaps *caps);
|
||||
|
||||
|
@ -483,7 +483,7 @@ gst_v4lmjpegsrc_srcconnect (GstPad *pad,
|
|||
}
|
||||
|
||||
|
||||
static GstBuffer*
|
||||
static GstData*
|
||||
gst_v4lmjpegsrc_get (GstPad *pad)
|
||||
{
|
||||
GstV4lMjpegSrc *v4lmjpegsrc;
|
||||
|
@ -588,7 +588,7 @@ gst_v4lmjpegsrc_get (GstPad *pad)
|
|||
g_signal_emit(G_OBJECT(v4lmjpegsrc),
|
||||
gst_v4lmjpegsrc_signals[SIGNAL_FRAME_CAPTURE], 0);
|
||||
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ static GstPadLinkReturn gst_v4lsrc_srcconnect (GstPad *pad,
|
|||
GstCaps *caps);
|
||||
static GstCaps* gst_v4lsrc_getcaps (GstPad *pad,
|
||||
GstCaps *caps);
|
||||
static GstBuffer* gst_v4lsrc_get (GstPad *pad);
|
||||
static GstData* gst_v4lsrc_get (GstPad *pad);
|
||||
|
||||
/* get/set params */
|
||||
static void gst_v4lsrc_set_property (GObject *object,
|
||||
|
@ -559,7 +559,7 @@ gst_v4lsrc_getcaps (GstPad *pad,
|
|||
}
|
||||
|
||||
|
||||
static GstBuffer*
|
||||
static GstData*
|
||||
gst_v4lsrc_get (GstPad *pad)
|
||||
{
|
||||
GstV4lSrc *v4lsrc;
|
||||
|
@ -651,7 +651,7 @@ gst_v4lsrc_get (GstPad *pad)
|
|||
g_signal_emit(G_OBJECT(v4lsrc),
|
||||
gst_v4lsrc_signals[SIGNAL_FRAME_CAPTURE], 0);
|
||||
|
||||
return buf;
|
||||
return GST_DATA (buf);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ static GstElementClass *parent_class = NULL;
|
|||
static void sinesrc_init (SineSrc *src);
|
||||
static void sinesrc_class_init (SineSrcClass *klass);
|
||||
|
||||
static GstBuffer * sinesrc_get (GstPad *pad);
|
||||
static GstData * sinesrc_get (GstPad *pad);
|
||||
static GstElementStateReturn sinesrc_change_state (GstElement *element);
|
||||
|
||||
|
||||
|
@ -171,7 +171,7 @@ static gint8 IDENTITY(gint8 x) { return x; };
|
|||
}\
|
||||
data = p;\
|
||||
}
|
||||
static GstBuffer *
|
||||
static GstData *
|
||||
sinesrc_get (GstPad *pad)
|
||||
{
|
||||
GstBuffer *buf;
|
||||
|
|
|
@ -51,7 +51,7 @@ static GstElementClass *parent_class = NULL;
|
|||
static void sinesrc_init (SineSrc *src);
|
||||
static void sinesrc_class_init (SineSrcClass *klass);
|
||||
|
||||
static GstBuffer * sinesrc_get (GstPad *pad);
|
||||
static GstData * sinesrc_get (GstPad *pad);
|
||||
static GstElementStateReturn sinesrc_change_state (GstElement *element);
|
||||
|
||||
|
||||
|
@ -171,7 +171,7 @@ static gint8 IDENTITY(gint8 x) { return x; };
|
|||
}\
|
||||
data = p;\
|
||||
}
|
||||
static GstBuffer *
|
||||
static GstData *
|
||||
sinesrc_get (GstPad *pad)
|
||||
{
|
||||
GstBuffer *buf;
|
||||
|
|
Loading…
Reference in a new issue