diff options
66 files changed, 245 insertions, 199 deletions
diff --git a/common b/common -Subproject b7abb510aa14e8692df39ea8c2c758e37d8a8d8 +Subproject e903f88a7388f0b463204ea1f960a4ace840175 diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c index d9613f74..e70dbda7 100644 --- a/ext/artsd/gstartsdsink.c +++ b/ext/artsd/gstartsdsink.c @@ -83,7 +83,7 @@ static void gst_artsdsink_close_audio (GstArtsdsink *sink); static GstElementStateReturn gst_artsdsink_change_state (GstElement *element); static gboolean gst_artsdsink_sync_parms (GstArtsdsink *artsdsink); static GstPadLinkReturn gst_artsdsink_link (GstPad *pad, GstCaps *caps); -static void gst_artsdsink_chain (GstPad *pad, GstBuffer *buf); +static void gst_artsdsink_chain (GstPad *pad, GstData *_data); static void gst_artsdsink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -188,8 +188,9 @@ gst_artsdsink_link (GstPad *pad, GstCaps *caps) } static void -gst_artsdsink_chain (GstPad *pad, GstBuffer *buf) +gst_artsdsink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstArtsdsink *artsdsink; g_return_if_fail(pad != NULL); diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c index 183f5147..248389f6 100644 --- a/ext/audiofile/gstafparse.c +++ b/ext/audiofile/gstafparse.c @@ -195,7 +195,7 @@ gst_afparse_loop(GstElement *element) /* just stop if we cannot open the file */ if (!gst_afparse_open_file (afparse)){ gst_bytestream_destroy ((GstByteStream *) afparse->vfile->closure); - gst_pad_push (afparse->srcpad, GST_BUFFER(gst_event_new (GST_EVENT_EOS))); + gst_pad_push (afparse->srcpad, GST_DATA(gst_event_new (GST_EVENT_EOS))); gst_element_set_eos (GST_ELEMENT (afparse)); return; } @@ -236,14 +236,14 @@ gst_afparse_loop(GstElement *element) gst_bytestream_get_status (bs, &waiting, &event); if (event && GST_EVENT_TYPE(event) == GST_EVENT_EOS) { gst_pad_push (afparse->srcpad, - GST_BUFFER (gst_event_new (GST_EVENT_EOS))); + GST_DATA (gst_event_new (GST_EVENT_EOS))); gst_element_set_eos (GST_ELEMENT (afparse)); break; } } else { GST_BUFFER_TIMESTAMP(buf) = afparse->timestamp; - gst_pad_push (afparse->srcpad, buf); + gst_pad_push (afparse->srcpad, GST_DATA (buf)); if (got_bytes != bytes_per_read){ /* this shouldn't happen very often */ /* FIXME calculate the timestamps based on the fewer bytes received */ @@ -269,12 +269,12 @@ gst_afparse_loop(GstElement *element) if (numframes < 1){ gst_buffer_unref(buf); - gst_pad_push (afparse->srcpad, GST_BUFFER(gst_event_new (GST_EVENT_EOS))); + gst_pad_push (afparse->srcpad, GST_DATA(gst_event_new (GST_EVENT_EOS))); gst_element_set_eos (GST_ELEMENT (afparse)); break; } GST_BUFFER_SIZE(buf) = numframes * frames_to_bytes; - gst_pad_push (afparse->srcpad, buf); + gst_pad_push (afparse->srcpad, GST_DATA (buf)); afparse->timestamp += numframes * 1E9 / afparse->rate; } while (TRUE); diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c index 3392717c..fd80975e 100644 --- a/ext/audiofile/gstafsink.c +++ b/ext/audiofile/gstafsink.c @@ -104,7 +104,7 @@ static void gst_afsink_init (GstAFSink *afsink); static gboolean gst_afsink_open_file (GstAFSink *sink); static void gst_afsink_close_file (GstAFSink *sink); -static void gst_afsink_chain (GstPad *pad,GstBuffer *buf); +static void gst_afsink_chain (GstPad *pad,GstData *_data); static void gst_afsink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -389,8 +389,9 @@ gst_afsink_close_file (GstAFSink *sink) * take the buffer from the pad and write to file if it's open */ static void -gst_afsink_chain (GstPad *pad, GstBuffer *buf) +gst_afsink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstAFSink *afsink; int ret = 0; diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c index 2b817310..8c1a0c69 100644 --- a/ext/audiofile/gstafsrc.c +++ b/ext/audiofile/gstafsrc.c @@ -105,7 +105,7 @@ static void gst_afsrc_init (GstAFSrc *afsrc); static gboolean gst_afsrc_open_file (GstAFSrc *src); static void gst_afsrc_close_file (GstAFSrc *src); -static GstBuffer* gst_afsrc_get (GstPad *pad); +static GstData* gst_afsrc_get (GstPad *pad); static void gst_afsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -190,7 +190,7 @@ gst_afsrc_init (GstAFSrc *afsrc) afsrc->framestamp = 0; } -static GstBuffer * +static GstData * gst_afsrc_get (GstPad *pad) { GstAFSrc *src; @@ -216,7 +216,7 @@ gst_afsrc_get (GstPad *pad) readbytes = readframes * (src->channels * src->width / 8); if (readbytes == 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)); } GST_BUFFER_SIZE (buf) = readbytes; @@ -231,7 +231,7 @@ gst_afsrc_get (GstPad *pad) GST_BUFFER_TIMESTAMP (buf) / 1E9); /* g_print("DEBUG: gstafsrc: pushed buffer of %ld bytes\n", readbytes); */ - return buf; + return GST_DATA (buf); } static void diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index e1cfd2c9..988a7ef2 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -264,8 +264,9 @@ gst_divxdec_dispose (GObject *object) static void gst_divxdec_chain (GstPad *pad, - GstBuffer *buf) + GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstDivxDec *divxdec; GstBuffer *outbuf; DEC_FRAME xframe; @@ -310,7 +311,7 @@ gst_divxdec_chain (GstPad *pad, return; } - gst_pad_push(divxdec->srcpad, outbuf); + gst_pad_push(divxdec->srcpad, GST_DATA (outbuf)); gst_buffer_unref(buf); } diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c index 718b226d..3da3d6cf 100644 --- a/ext/divx/gstdivxenc.c +++ b/ext/divx/gstdivxenc.c @@ -339,8 +339,9 @@ gst_divxenc_dispose (GObject *object) static void gst_divxenc_chain (GstPad *pad, - GstBuffer *buf) + GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstDivxEnc *divxenc; GstBuffer *outbuf; ENC_FRAME xframe; @@ -376,7 +377,7 @@ gst_divxenc_chain (GstPad *pad, GST_BUFFER_FLAG_SET(outbuf, GST_BUFFER_KEY_UNIT); /* go out, multiply! */ - gst_pad_push(divxenc->srcpad, outbuf); + gst_pad_push(divxenc->srcpad, GST_DATA (outbuf)); /* proclaim destiny */ g_signal_emit(G_OBJECT(divxenc),gst_divxenc_signals[FRAME_ENCODED], 0); diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c index e857feff..a028255e 100644 --- a/ext/gsm/gstgsmdec.c +++ b/ext/gsm/gstgsmdec.c @@ -52,7 +52,7 @@ enum { static void gst_gsmdec_class_init (GstGSMDec *klass); static void gst_gsmdec_init (GstGSMDec *gsmdec); -static void gst_gsmdec_chain (GstPad *pad, GstBuffer *buf); +static void gst_gsmdec_chain (GstPad *pad, GstData *_data); static GstPadLinkReturn gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps); static GstElementClass *parent_class = NULL; @@ -137,8 +137,9 @@ gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps) } static void -gst_gsmdec_chain (GstPad *pad, GstBuffer *buf) +gst_gsmdec_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstGSMDec *gsmdec; gsm_byte *data; guint size; @@ -164,7 +165,7 @@ gst_gsmdec_chain (GstPad *pad, GstBuffer *buf) gsm_decode (gsmdec->state, gsmdec->buffer, (gsm_signal *) GST_BUFFER_DATA (outbuf)); - gst_pad_push (gsmdec->srcpad, outbuf); + gst_pad_push (gsmdec->srcpad, GST_DATA (outbuf)); size -= (33 - gsmdec->bufsize); data += (33 - gsmdec->bufsize); @@ -180,7 +181,7 @@ gst_gsmdec_chain (GstPad *pad, GstBuffer *buf) gsm_decode (gsmdec->state, data, (gsm_signal *)GST_BUFFER_DATA (outbuf)); - gst_pad_push (gsmdec->srcpad, outbuf); + gst_pad_push (gsmdec->srcpad, GST_DATA (outbuf)); size -= 33; data += 33; diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c index 9a41430b..dc6ef76a 100644 --- a/ext/gsm/gstgsmenc.c +++ b/ext/gsm/gstgsmenc.c @@ -53,7 +53,7 @@ enum { static void gst_gsmenc_class_init (GstGSMEnc *klass); static void gst_gsmenc_init (GstGSMEnc *gsmenc); -static void gst_gsmenc_chain (GstPad *pad,GstBuffer *buf); +static void gst_gsmenc_chain (GstPad *pad,GstData *_data); static GstPadLinkReturn gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps); static GstElementClass *parent_class = NULL; @@ -142,8 +142,9 @@ gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps) } static void -gst_gsmenc_chain (GstPad *pad, GstBuffer *buf) +gst_gsmenc_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstGSMEnc *gsmenc; gsm_signal *data; guint size; @@ -179,7 +180,7 @@ gst_gsmenc_chain (GstPad *pad, GstBuffer *buf) gsm_encode (gsmenc->state, gsmenc->buffer, (gsm_byte *) GST_BUFFER_DATA (outbuf)); GST_BUFFER_TIMESTAMP (outbuf) = gsmenc->next_ts; - gst_pad_push (gsmenc->srcpad, outbuf); + gst_pad_push (gsmenc->srcpad, GST_DATA (outbuf)); gsmenc->next_ts += (160.0 / gsmenc->rate) * 1000000; size -= (160 - gsmenc->bufsize); @@ -197,7 +198,7 @@ gst_gsmenc_chain (GstPad *pad, GstBuffer *buf) gsm_encode (gsmenc->state, data, (gsm_byte *) GST_BUFFER_DATA (outbuf)); GST_BUFFER_TIMESTAMP (outbuf) = gsmenc->next_ts; - gst_pad_push (gsmenc->srcpad, outbuf); + gst_pad_push (gsmenc->srcpad, GST_DATA (outbuf)); gsmenc->next_ts += (160 / gsmenc->rate) * GST_SECOND; size -= 160; diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index e7dc9cf6..8ef7f035 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -65,7 +65,7 @@ static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps); static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps); -static void gst_colorspace_chain (GstPad *pad, GstBuffer *buf); +static void gst_colorspace_chain (GstPad *pad, GstData *_data); static GstElementStateReturn gst_colorspace_change_state (GstElement *element); @@ -471,8 +471,9 @@ gst_colorspace_init (GstColorspace *space) } static void -gst_colorspace_chain (GstPad *pad,GstBuffer *buf) +gst_colorspace_chain (GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstColorspace *space; gint size; GstBuffer *outbuf = NULL; @@ -554,7 +555,7 @@ gst_colorspace_chain (GstPad *pad,GstBuffer *buf) gst_buffer_unref (buf); } - gst_pad_push (space->srcpad, outbuf); + gst_pad_push (space->srcpad, GST_DATA (outbuf)); } static GstElementStateReturn diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c index 5b270fb9..fa9f8ef3 100644 --- a/ext/ivorbis/vorbisfile.c +++ b/ext/ivorbis/vorbisfile.c @@ -609,7 +609,7 @@ gst_ivorbisfile_loop (GstElement *element) discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, GST_FORMAT_DEFAULT, samples, NULL); - gst_pad_push (ivorbisfile->srcpad, GST_BUFFER (discont)); + gst_pad_push (ivorbisfile->srcpad, GST_DATA (discont)); } } @@ -623,7 +623,7 @@ gst_ivorbisfile_loop (GstElement *element) } if (GST_PAD_IS_USABLE (ivorbisfile->srcpad)) - gst_pad_push (ivorbisfile->srcpad, outbuf); + gst_pad_push (ivorbisfile->srcpad, GST_DATA (outbuf)); else gst_buffer_unref (outbuf); } diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 4835813a..98ec91d2 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -439,7 +439,7 @@ gst_jack_loop (GstElement *element) pad = GST_JACK_PAD (pads); if (this->direction == GST_PAD_SINK) { - buffer = gst_pad_pull (pad->pad); + buffer = GST_BUFFER (gst_pad_pull (pad->pad)); if (GST_IS_EVENT (buffer)) { GstEvent *event = GST_EVENT (buffer); @@ -470,7 +470,7 @@ gst_jack_loop (GstElement *element) gst_buffer_set_data (buffer, pad->data, len); GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_DONTFREE); - gst_pad_push (pad->pad, buffer); + gst_pad_push (pad->pad, GST_DATA (buffer)); } pads = g_list_next (pads); } diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 5f16dbf5..f22b4aac 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -76,8 +76,8 @@ static void gst_ladspa_deactivate (GstLADSPA *ladspa); static GstElementStateReturn gst_ladspa_change_state (GstElement *element); static void gst_ladspa_loop (GstElement *element); -static void gst_ladspa_chain (GstPad *pad,GstBuffer *buf); -static GstBuffer * gst_ladspa_get (GstPad *pad); +static void gst_ladspa_chain (GstPad *pad,GstData *_data); +static GstData * gst_ladspa_get (GstPad *pad); static GstElementClass *parent_class = NULL; @@ -676,13 +676,13 @@ gst_ladspa_loop (GstElement *element) /* first get all the necessary data from the input ports */ for (i=0 ; i<numsinkpads ; i++){ get_buffer: - buffers_in[i] = gst_pad_pull (ladspa->sinkpads[i]); + buffers_in[i] = GST_BUFFER (gst_pad_pull (ladspa->sinkpads[i])); if (GST_IS_EVENT (buffers_in[i])) { /* push it out on all pads */ gst_data_ref_by_count ((GstData*)buffers_in[i], numsrcpads); for (j=0; j<numsrcpads; j++) - gst_pad_push (ladspa->srcpads[j], buffers_in[i]); + gst_pad_push (ladspa->srcpads[j], GST_DATA (buffers_in[i])); if (GST_EVENT_TYPE (buffers_in[i]) == GST_EVENT_EOS) { /* shut down */ gst_element_set_eos (element); @@ -753,7 +753,7 @@ gst_ladspa_loop (GstElement *element) } for (i=0 ; i<numsrcpads ; i++) { DEBUG_OBJ (ladspa, "pushing buffer (%p) on src pad %d", buffers_out[i], i); - gst_pad_push (ladspa->srcpads[i], buffers_out[i]); + gst_pad_push (ladspa->srcpads[i], GST_DATA (buffers_out[i])); data_out[i] = NULL; buffers_out[i] = NULL; @@ -770,8 +770,9 @@ gst_ladspa_loop (GstElement *element) } static void -gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in) +gst_ladspa_chain (GstPad *pad, GstData *_data) { + GstBuffer *buffer_in = GST_BUFFER (_data); LADSPA_Descriptor *desc; LADSPA_Data *data_in, **data_out = NULL; GstBuffer **buffers_out = NULL; @@ -850,7 +851,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in) for (i=0; i<numsrcpads; i++) { DEBUG_OBJ (ladspa, "pushing buffer (%p, length %u bytes) on src pad %d", buffers_out[i], GST_BUFFER_SIZE (buffers_out[i]), i); - gst_pad_push (ladspa->srcpads[i], buffers_out[i]); + gst_pad_push (ladspa->srcpads[i], GST_DATA (buffers_out[i])); } g_free(buffers_out); @@ -858,7 +859,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buffer_in) } } -static GstBuffer * +static GstData * gst_ladspa_get(GstPad *pad) { GstLADSPA *ladspa; @@ -902,7 +903,7 @@ gst_ladspa_get(GstPad *pad) num_processed = num_to_process; } - return buf; + return GST_DATA (buf); } static void diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index 0ed3b278..81e1ab3d 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -104,7 +104,7 @@ static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps); static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps); -static void gst_colorspace_chain (GstPad *pad, GstBuffer *buf); +static void gst_colorspace_chain (GstPad *pad, GstData *_data); static GstElementStateReturn gst_colorspace_change_state (GstElement *element); @@ -383,8 +383,9 @@ gst_colorspace_init (GstColorspace *space) } static void -gst_colorspace_chain (GstPad *pad,GstBuffer *buf) +gst_colorspace_chain (GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstColorspace *space; GstBuffer *outbuf = NULL; @@ -433,7 +434,7 @@ gst_colorspace_chain (GstPad *pad,GstBuffer *buf) gst_buffer_unref (buf); } - gst_pad_push (space->srcpad, outbuf); + gst_pad_push (space->srcpad, GST_DATA (outbuf)); } static GstElementStateReturn diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index f0d566e4..8b5a5c9f 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -168,7 +168,7 @@ static void gst_fameenc_set_property (GObject *object, guint prop_id, static void gst_fameenc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_fameenc_chain (GstPad *pad, GstBuffer *buf); +static void gst_fameenc_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_fameenc_signals[LAST_SIGNAL] = { 0 };*/ @@ -415,8 +415,9 @@ gst_fameenc_dispose (GObject *object) } static void -gst_fameenc_chain (GstPad *pad, GstBuffer *buf) +gst_fameenc_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstFameEnc *fameenc; guchar *data; gulong size; @@ -474,7 +475,7 @@ gst_fameenc_chain (GstPad *pad, GstBuffer *buf) GST_DEBUG ("gst_fameenc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); - gst_pad_push (fameenc->srcpad, outbuf); + gst_pad_push (fameenc->srcpad, GST_DATA (outbuf)); } fame_end_frame (fameenc->fc, NULL); diff --git a/ext/mas/massink.c b/ext/mas/massink.c index b4a8f6dc..8e564bdf 100644 --- a/ext/mas/massink.c +++ b/ext/mas/massink.c @@ -80,7 +80,7 @@ static GstElementStateReturn gst_massink_change_state (GstElement *element); static gboolean gst_massink_sync_parms (GstMassink *massink); static GstPadLinkReturn gst_massink_sinkconnect (GstPad *pad, GstCaps *caps); -static void gst_massink_chain (GstPad *pad, GstBuffer *buf); +static void gst_massink_chain (GstPad *pad, GstData *_data); static void gst_massink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -213,8 +213,9 @@ gst_massink_sinkconnect (GstPad *pad, GstCaps *caps) } static void -gst_massink_chain (GstPad *pad, GstBuffer *buf) +gst_massink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); gint32 err; g_return_if_fail(pad != NULL); diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 03cc6e8d..8f8a94a3 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -392,7 +392,7 @@ gst_mplex_write_callback (PS_Stream *stream, uint8_t *data, size_t size, void *u outbuf = gst_buffer_new_and_alloc (size); memcpy (GST_BUFFER_DATA (outbuf), data, size); - gst_pad_push (mplex->srcpad, outbuf); + gst_pad_push (mplex->srcpad, GST_DATA (outbuf)); } return size; @@ -476,7 +476,7 @@ gst_mplex_loop (GstElement *element) case GST_MPLEX_END: { mplex->ostrm->Close (); - gst_pad_push (mplex->srcpad, GST_BUFFER (gst_event_new (GST_EVENT_EOS))); + gst_pad_push (mplex->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS))); gst_element_set_eos (element); break; } diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 1a8abafd..bccf6ec4 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -49,7 +49,7 @@ static gboolean gst_sdlvideosink_create (GstSDLVideoSink static GstPadLinkReturn gst_sdlvideosink_sinkconnect (GstPad *pad, GstCaps *caps); static void gst_sdlvideosink_chain (GstPad *pad, - GstBuffer *buf); + GstData *data); static void gst_sdlvideosink_set_property (GObject *object, guint prop_id, @@ -339,8 +339,9 @@ gst_sdlvideosink_sinkconnect (GstPad *pad, static void -gst_sdlvideosink_chain (GstPad *pad, GstBuffer *buf) +gst_sdlvideosink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSDLVideoSink *sdlvideosink; SDL_Event sdl_event; diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c index 1badacd5..72156e92 100644 --- a/ext/shout/gstshout.c +++ b/ext/shout/gstshout.c @@ -92,7 +92,7 @@ sink_template_factory (void) static void gst_icecastsend_class_init (GstIcecastSendClass *klass); static void gst_icecastsend_init (GstIcecastSend *icecastsend); -static void gst_icecastsend_chain (GstPad *pad, GstBuffer *buf); +static void gst_icecastsend_chain (GstPad *pad, GstData *_data); static void gst_icecastsend_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_icecastsend_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); @@ -215,8 +215,9 @@ gst_icecastsend_init (GstIcecastSend *icecastsend) } static void -gst_icecastsend_chain (GstPad *pad, GstBuffer *buf) +gst_icecastsend_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstIcecastSend *icecastsend; glong ret; diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c index a8b88496..5fcd79c0 100644 --- a/ext/smoothwave/gstsmoothwave.c +++ b/ext/smoothwave/gstsmoothwave.c @@ -56,7 +56,7 @@ static void gst_smoothwave_init (GstSmoothWave *smoothwave); static void gst_smoothwave_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_smoothwave_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_smoothwave_chain (GstPad *pad, GstBuffer *buf); +static void gst_smoothwave_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_smoothwave_signals[LAST_SIGNAL] = { 0 }; */ @@ -146,8 +146,9 @@ gst_smoothwave_init (GstSmoothWave *smoothwave) } static void -gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) +gst_smoothwave_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSmoothWave *smoothwave; gint16 *samples; gint samplecount,i; diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index f2669d9f..cc70dce7 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -87,7 +87,7 @@ static GType gst_snapshot_get_type (void); static void gst_snapshot_class_init (GstSnapshotClass *klass); static void gst_snapshot_init (GstSnapshot *snapshot); -static void gst_snapshot_chain (GstPad *pad, GstBuffer *buf); +static void gst_snapshot_chain (GstPad *pad, GstData *_data); static void gst_snapshot_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_snapshot_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); @@ -249,8 +249,9 @@ gst_snapshot_init (GstSnapshot *snapshot) static void -gst_snapshot_chain (GstPad *pad, GstBuffer *buf) +gst_snapshot_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSnapshot *snapshot; guchar *data, *data_to_convert, *buffer_i420, *data_converted; gulong size,image_size; @@ -330,7 +331,7 @@ gst_snapshot_chain (GstPad *pad, GstBuffer *buf) } } - gst_pad_push(snapshot->srcpad,buf ); + gst_pad_push(snapshot->srcpad,GST_DATA (buf )); } static void diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c index 3d75087b..631c7a65 100644 --- a/ext/sndfile/gstsf.c +++ b/ext/sndfile/gstsf.c @@ -703,7 +703,7 @@ gst_sf_loop (GstElement *element) data = (gfloat*)GST_BUFFER_DATA (out); for (j=0; j<read; j++) data[j] = buf[j * nchannels + i % nchannels]; - gst_pad_push (channel->pad, out); + gst_pad_push (channel->pad, GST_DATA (out)); } this->time += read * (GST_SECOND / this->rate); @@ -715,7 +715,7 @@ gst_sf_loop (GstElement *element) eos = 0; } else { for (l=this->channels; l; l=l->next) - gst_pad_push (GST_SF_CHANNEL (l)->pad, (GstBuffer*)gst_event_new (GST_EVENT_EOS)); + gst_pad_push (GST_SF_CHANNEL (l)->pad, GST_DATA (gst_event_new (GST_EVENT_EOS))); gst_element_set_eos (element); } } @@ -740,7 +740,7 @@ gst_sf_loop (GstElement *element) for (i=0,l=this->channels; l; l=l->next,i++) { channel = GST_SF_CHANNEL (l); - in = gst_pad_pull (channel->pad); + in = GST_BUFFER (gst_pad_pull (channel->pad)); if (buffer_frames == 0) { /* pulling a buffer from the pad should have caused capsnego to occur, diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 119c0403..5bfa9d39 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -206,7 +206,7 @@ gst_swfdec_loop(GstElement *element) ret = swfdec_decoder_parse(swfdec->state); if(ret==SWF_NEEDBITS){ - buf = gst_pad_pull(swfdec->sinkpad); + buf = GST_BUFFER (gst_pad_pull(swfdec->sinkpad)); if(GST_IS_EVENT(buf)){ switch (GST_EVENT_TYPE (buf)) { case GST_EVENT_EOS: @@ -253,7 +253,7 @@ gst_swfdec_loop(GstElement *element) swfdec->timestamp += swfdec->interval; GST_BUFFER_TIMESTAMP(newbuf) = swfdec->timestamp; - gst_pad_push(swfdec->videopad, newbuf); + gst_pad_push(swfdec->videopad, GST_DATA (newbuf)); /* audio stuff */ @@ -265,15 +265,15 @@ gst_swfdec_loop(GstElement *element) GST_BUFFER_DATA(newbuf) = data; GST_BUFFER_TIMESTAMP(newbuf) = swfdec->timestamp; - gst_pad_push(swfdec->audiopad, newbuf); + gst_pad_push(swfdec->audiopad, GST_DATA (newbuf)); data = swfdec_decoder_get_sound_chunk(swfdec->state, &len); } } if(ret==SWF_EOF){ - gst_pad_push(swfdec->videopad, GST_BUFFER (gst_event_new (GST_EVENT_EOS))); - gst_pad_push(swfdec->audiopad, GST_BUFFER (gst_event_new (GST_EVENT_EOS))); + gst_pad_push(swfdec->videopad, GST_DATA (gst_event_new (GST_EVENT_EOS))); + gst_pad_push(swfdec->audiopad, GST_DATA (gst_event_new (GST_EVENT_EOS))); } } diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c index f77e5c8f..c8936b63 100644 --- a/ext/tarkin/gsttarkindec.c +++ b/ext/tarkin/gsttarkindec.c @@ -56,7 +56,7 @@ enum static void gst_tarkindec_class_init (TarkinDecClass *klass); static void gst_tarkindec_init (TarkinDec *arkindec); -static void gst_tarkindec_chain (GstPad *pad, GstBuffer *buf); +static void gst_tarkindec_chain (GstPad *pad, GstData *_data); static void gst_tarkindec_setup (TarkinDec *tarkindec); static GstElementStateReturn gst_tarkindec_change_state (GstElement *element); @@ -145,8 +145,9 @@ gst_tarkindec_setup (TarkinDec *tarkindec) } static void -gst_tarkindec_chain (GstPad *pad, GstBuffer *buf) +gst_tarkindec_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); TarkinDec *tarkindec; g_return_if_fail (pad != NULL); @@ -234,7 +235,7 @@ gst_tarkindec_chain (GstPad *pad, GstBuffer *buf) GST_BUFFER_DATA (outbuf) = rgb; GST_BUFFER_SIZE (outbuf) = layer->width * layer->height * 3; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (tarkindec->srcpad, outbuf); + gst_pad_push (tarkindec->srcpad, GST_DATA (outbuf)); tarkin_synthesis_freeframe (tarkindec->tarkin_stream, rgb); } diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c index ff3d295e..beddd876 100644 --- a/ext/tarkin/gsttarkinenc.c +++ b/ext/tarkin/gsttarkinenc.c @@ -58,7 +58,7 @@ enum static void gst_tarkinenc_class_init (TarkinEncClass *klass); static void gst_tarkinenc_init (TarkinEnc *arkinenc); -static void gst_tarkinenc_chain (GstPad *pad, GstBuffer *buf); +static void gst_tarkinenc_chain (GstPad *pad, GstData *_data); static void gst_tarkinenc_setup (TarkinEnc *tarkinenc); static void gst_tarkinenc_get_property (GObject *object, guint prop_id, GValue *value, @@ -184,24 +184,24 @@ TarkinError packet_out (void *stream, ogg_packet *op) GST_BUFFER_DATA (outbuf) = og.header; GST_BUFFER_SIZE (outbuf) = og.header_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (te->srcpad, outbuf); + gst_pad_push (te->srcpad, GST_DATA (outbuf)); outbuf = gst_buffer_new (); GST_BUFFER_DATA (outbuf) = og.body; GST_BUFFER_SIZE (outbuf) = og.body_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (te->srcpad, outbuf); + gst_pad_push (te->srcpad, GST_DATA (outbuf)); } else { while (ogg_stream_pageout (&te->os, &og)){ outbuf = gst_buffer_new (); GST_BUFFER_DATA (outbuf) = og.header; GST_BUFFER_SIZE (outbuf) = og.header_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (te->srcpad, outbuf); + gst_pad_push (te->srcpad, GST_DATA (outbuf)); outbuf = gst_buffer_new (); GST_BUFFER_DATA (outbuf) = og.body; GST_BUFFER_SIZE (outbuf) = og.body_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (te->srcpad, outbuf); + gst_pad_push (te->srcpad, GST_DATA (outbuf)); } } return (TARKIN_OK); @@ -243,20 +243,21 @@ gst_tarkinenc_setup (TarkinEnc *tarkinenc) GST_BUFFER_DATA (outbuf) = tarkinenc->og.header; GST_BUFFER_SIZE (outbuf) = tarkinenc->og.header_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (tarkinenc->srcpad, outbuf); + gst_pad_push (tarkinenc->srcpad, GST_DATA (outbuf)); outbuf = gst_buffer_new (); GST_BUFFER_DATA (outbuf) = tarkinenc->og.body; GST_BUFFER_SIZE (outbuf) = tarkinenc->og.body_len; GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_DONTFREE); - gst_pad_push (tarkinenc->srcpad, outbuf); + gst_pad_push (tarkinenc->srcpad, GST_DATA (outbuf)); tarkinenc->setup = TRUE; } static void -gst_tarkinenc_chain (GstPad *pad, GstBuffer *buf) +gst_tarkinenc_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); TarkinEnc *tarkinenc; g_return_if_fail (pad != NULL); diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index 50e72a3c..d22cbce4 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -216,8 +216,9 @@ gst_xviddec_dispose (GObject *object) static void gst_xviddec_chain (GstPad *pad, - GstBuffer *buf) + GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstXvidDec *xviddec; GstBuffer *outbuf; XVID_DEC_FRAME xframe; @@ -262,7 +263,7 @@ gst_xviddec_chain (GstPad *pad, return; } - gst_pad_push(xviddec->srcpad, outbuf); + gst_pad_push(xviddec->srcpad, GST_DATA (outbuf)); gst_buffer_unref(buf); } diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c index b217b652..a4b37341 100644 --- a/ext/xvid/gstxvidenc.c +++ b/ext/xvid/gstxvidenc.c @@ -251,8 +251,9 @@ gst_xvidenc_setup (GstXvidEnc *xvidenc) static void gst_xvidenc_chain (GstPad *pad, - GstBuffer *buf) + GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstXvidEnc *xvidenc; GstBuffer *outbuf; XVID_ENC_FRAME xframe; @@ -297,7 +298,7 @@ gst_xvidenc_chain (GstPad *pad, GST_BUFFER_FLAG_SET(outbuf, GST_BUFFER_KEY_UNIT); /* go out, multiply! */ - gst_pad_push(xvidenc->srcpad, outbuf); + gst_pad_push(xvidenc->srcpad, GST_DATA (outbuf)); /* proclaim destiny */ g_signal_emit(G_OBJECT(xvidenc),gst_xvidenc_signals[FRAME_ENCODED], 0); diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c index bfe3c8ac..a601b727 100644 --- a/gst/cdxaparse/gstcdxaparse.c +++ b/gst/cdxaparse/gstcdxaparse.c @@ -305,7 +305,7 @@ gst_cdxa_parse_loop (GstElement *element) outbuf = gst_buffer_create_sub (buf, 24, CDXA_DATA_SIZE); gst_buffer_unref (buf); - gst_pad_push (cdxa_parse->srcpad, outbuf); + gst_pad_push (cdxa_parse->srcpad, GST_DATA (outbuf)); } } diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index bc86b893..bf6b3db8 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -116,7 +116,7 @@ static void gst_chart_init (GstChart *chart); static void gst_chart_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_chart_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_chart_chain (GstPad *pad, GstBuffer *buf); +static void gst_chart_chain (GstPad *pad, GstData *_data); static GstPadLinkReturn gst_chart_sinkconnect (GstPad *pad, GstCaps *caps); @@ -306,8 +306,9 @@ draw_chart_16bpp(guchar * output, gint width, gint height, } static void -gst_chart_chain (GstPad *pad, GstBuffer *bufin) +gst_chart_chain (GstPad *pad, GstData *_data) { + GstBuffer *bufin = GST_BUFFER (_data); GstChart *chart; GstBuffer *bufout; guint32 samples_in; @@ -381,7 +382,7 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin) GST_DEBUG ("CHART: outputting buffer"); /* output buffer */ GST_BUFFER_FLAG_SET (bufout, GST_BUFFER_READONLY); - gst_pad_push (chart->srcpad, bufout); + gst_pad_push (chart->srcpad, GST_DATA (bufout)); } } else { GST_DEBUG ("CHART: skipping buffer"); diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index 3a63eb17..81384d81 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -90,7 +90,7 @@ static void gst_deinterlace_set_property (GObject *object, guint prop_id, static void gst_deinterlace_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_deinterlace_chain (GstPad *pad, GstBuffer *buf); +static void gst_deinterlace_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */ @@ -187,8 +187,9 @@ gst_deinterlace_init (GstDeInterlace *filter) } static void -gst_deinterlace_chain (GstPad *pad, GstBuffer *buf) +gst_deinterlace_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstDeInterlace *filter; gint y0, y1, y2, y3; guchar *psrc1, *psrc2, *psrc3, *pdst1, *yuvptr, *src; @@ -295,7 +296,7 @@ gst_deinterlace_chain (GstPad *pad, GstBuffer *buf) } } - gst_pad_push (filter->srcpad, buf); + gst_pad_push (filter->srcpad, GST_DATA (buf)); } static void diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c index 4113410a..31484364 100644 --- a/gst/festival/gstfestival.c +++ b/gst/festival/gstfestival.c @@ -82,7 +82,7 @@ static void gst_festival_init (GstFestival *festival); static GstCaps* text_type_find (GstByteStream *bs, gpointer private); -static void gst_festival_chain (GstPad *pad, GstBuffer *buf); +static void gst_festival_chain (GstPad *pad, GstData *_data); static GstElementStateReturn gst_festival_change_state (GstElement *element); @@ -231,8 +231,9 @@ text_type_find (GstByteStream *bs, gpointer private) static void -gst_festival_chain (GstPad *pad, GstBuffer *buf) +gst_festival_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); gchar *wavefile; int filesize; FILE *fd; @@ -302,7 +303,7 @@ gst_festival_chain (GstPad *pad, GstBuffer *buf) "channels", GST_PROPS_INT (1) )); } - gst_pad_push (festival->srcpad, outbuf); + gst_pad_push (festival->srcpad, GST_DATA (outbuf)); wavefile = NULL; } diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c index 68af7a28..be9feec7 100644 --- a/gst/filter/gstbpwsinc.c +++ b/gst/filter/gstbpwsinc.c @@ -104,7 +104,7 @@ static void gst_bpwsinc_set_property (GObject * object, guint prop_id, static void gst_bpwsinc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void gst_bpwsinc_chain (GstPad * pad, GstBuffer * buf); +static void gst_bpwsinc_chain (GstPad * pad, GstData *_data); static GstPadLinkReturn gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps); @@ -273,8 +273,9 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) } static void -gst_bpwsinc_chain (GstPad *pad, GstBuffer *buf) +gst_bpwsinc_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstBPWSinc *filter; gfloat *src; gfloat *input; @@ -321,7 +322,7 @@ gst_bpwsinc_chain (GstPad *pad, GstBuffer *buf) } g_free (input); - gst_pad_push (filter->srcpad, buf); + gst_pad_push (filter->srcpad, GST_DATA (buf)); } static void diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c index fcf2f43f..61fff92b 100644 --- a/gst/filter/gstiir.c +++ b/gst/filter/gstiir.c @@ -89,7 +89,7 @@ static void gst_iir_set_property (GObject * object, guint prop_id, static void gst_iir_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void gst_iir_chain (GstPad * pad, GstBuffer * buf); +static void gst_iir_chain (GstPad * pad, GstData *_data); static GstPadLinkReturn gst_iir_sink_connect (GstPad * pad, GstCaps * caps); @@ -188,8 +188,9 @@ gst_iir_sink_connect (GstPad * pad, GstCaps * caps) } static void -gst_iir_chain (GstPad * pad, GstBuffer * buf) +gst_iir_chain (GstPad * pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstIIR *filter; gfloat *src; int i; @@ -205,7 +206,7 @@ gst_iir_chain (GstPad * pad, GstBuffer * buf) for (i = 0; i < GST_BUFFER_SIZE (buf) / sizeof (gfloat); ++i) *(src + i) = (gfloat) IIR_filter (filter->state, (double) *(src + i)); - gst_pad_push (filter->srcpad, buf); + gst_pad_push (filter->srcpad, GST_DATA (buf)); } static void diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c index 54eb81d3..18bebef7 100644 --- a/gst/filter/gstlpwsinc.c +++ b/gst/filter/gstlpwsinc.c @@ -101,7 +101,7 @@ static void gst_lpwsinc_set_property (GObject * object, guint prop_id, static void gst_lpwsinc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void gst_lpwsinc_chain (GstPad * pad, GstBuffer * buf); +static void gst_lpwsinc_chain (GstPad * pad, GstData *_data); static GstPadLinkReturn gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps); @@ -221,8 +221,9 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) } static void -gst_lpwsinc_chain (GstPad * pad, GstBuffer * buf) +gst_lpwsinc_chain (GstPad * pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstLPWSinc *filter; gfloat *src; gfloat *input; @@ -269,7 +270,7 @@ gst_lpwsinc_chain (GstPad * pad, GstBuffer * buf) } g_free (input); - gst_pad_push (filter->srcpad, buf); + gst_pad_push (filter->srcpad, GST_DATA (buf)); } static void diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index 1f55b7d9..7ed55f1b 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -609,7 +609,7 @@ gst_flxdec_loop (GstElement *element) GST_BUFFER_TIMESTAMP (out) = flxdec->next_time; flxdec->next_time += flxdec->frame_time; - gst_pad_push(flxdec->srcpad, out); + gst_pad_push(flxdec->srcpad, GST_DATA (out)); break; } diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c index 9e7c7ac8..a795a6f5 100644 --- a/gst/mixmatrix/mixmatrix.c +++ b/gst/mixmatrix/mixmatrix.c @@ -452,7 +452,7 @@ fprintf(stderr,"attempting to get gain for %dx%d\n",i,j); for (i=0;i<mix->srcpadalloc;i++) { if (mix->srcpads[i] != NULL) { - gst_pad_push(mix->srcpads[i],outbufs[i]); + gst_pad_push(mix->srcpads[i],GST_DATA (outbufs[i])); } } } diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc index 07a09a1c..fb3cd24e 100644 --- a/gst/modplug/gstmodplug.cc +++ b/gst/modplug/gstmodplug.cc @@ -683,7 +683,7 @@ gst_modplug_loop (GstElement *element) GstEvent *discont; discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, value, NULL); - gst_pad_push (modplug->srcpad, GST_BUFFER (discont)); + gst_pad_push (modplug->srcpad, GST_DATA (discont)); modplug->need_discont= FALSE; } @@ -694,7 +694,7 @@ gst_modplug_loop (GstElement *element) GST_BUFFER_TIMESTAMP (buffer_out) = value; if (GST_PAD_IS_USABLE (modplug->srcpad)) - gst_pad_push (modplug->srcpad, buffer_out); + gst_pad_push (modplug->srcpad, GST_DATA (buffer_out)); } else if (GST_PAD_IS_LINKED (modplug->srcpad)) @@ -703,7 +703,7 @@ gst_modplug_loop (GstElement *element) gst_bytestream_flush (modplug->bs, 1); event = gst_event_new (GST_EVENT_EOS); - gst_pad_push (modplug->srcpad, GST_BUFFER (event)); + gst_pad_push (modplug->srcpad, GST_DATA (event)); gst_element_set_eos (element); modplug->eos = TRUE; } diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index 2f46a400..c713cde6 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -91,7 +91,7 @@ static void gst_system_encode_init (GstMPEG1SystemEncode *system_encode); static GstPad* gst_system_encode_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *unused); -static void gst_system_encode_chain (GstPad *pad, GstBuffer *buf); +static void gst_system_encode_chain (GstPad *pad, GstData *_data); static void gst_system_encode_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -459,7 +459,7 @@ gst_system_encode_multiplex(GstMPEG1SystemEncode *system_encode) GST_BUFFER_SIZE(outbuf) = system_encode->sector->length_of_sector; memcpy(GST_BUFFER_DATA(outbuf),system_encode->sector->buf, system_encode->sector->length_of_sector); system_encode->bytes_output += GST_BUFFER_SIZE(outbuf); - gst_pad_push(system_encode->srcpad,outbuf); + gst_pad_push(system_encode->srcpad,GST_DATA (outbuf)); GST_DEBUG ("system_encode::multiplex: writing %02x", mb->stream_id); @@ -471,8 +471,9 @@ gst_system_encode_multiplex(GstMPEG1SystemEncode *system_encode) } static void -gst_system_encode_chain (GstPad *pad, GstBuffer *buf) +gst_system_encode_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstMPEG1SystemEncode *system_encode; guchar *data; gulong size; diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c index 4af360fd..6bb3ddf3 100644 --- a/gst/mpeg1videoparse/gstmp1videoparse.c +++ b/gst/mpeg1videoparse/gstmp1videoparse.c @@ -85,7 +85,7 @@ enum { static void gst_mp1videoparse_class_init (Mp1VideoParseClass *klass); static void gst_mp1videoparse_init (Mp1VideoParse *mp1videoparse); -static void gst_mp1videoparse_chain (GstPad *pad, GstBuffer *buf); +static void gst_mp1videoparse_chain (GstPad *pad, GstData *_data); static void gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstPad *outpad); static void gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse); static GstElementStateReturn @@ -277,8 +277,9 @@ gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse) } static void -gst_mp1videoparse_chain (GstPad *pad,GstBuffer *buf) +gst_mp1videoparse_chain (GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); Mp1VideoParse *mp1videoparse; g_return_if_fail (pad != NULL); @@ -317,7 +318,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP case GST_EVENT_EOS: gst_mp1videoparse_flush(mp1videoparse); gst_event_ref(event); - gst_pad_push(outpad, GST_BUFFER (event)); + gst_pad_push(outpad, GST_DATA (event)); gst_element_set_eos (GST_ELEMENT (mp1videoparse)); break; default: @@ -438,7 +439,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP if (GST_PAD_CAPS (outpad) != NULL) { GST_DEBUG ("mp1videoparse: pushing %d bytes %" G_GUINT64_FORMAT, GST_BUFFER_SIZE(outbuf), GST_BUFFER_TIMESTAMP(outbuf)); - gst_pad_push(outpad, outbuf); + gst_pad_push(outpad, GST_DATA (outbuf)); GST_DEBUG ("mp1videoparse: pushing done"); } else { GST_DEBUG ("No capsnego yet, delaying buffer push"); diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c index 1a290b76..3dda7a38 100644 --- a/gst/mpeg2sub/gstmpeg2subt.c +++ b/gst/mpeg2sub/gstmpeg2subt.c @@ -27,8 +27,8 @@ static void gst_mpeg2subt_class_init (GstMpeg2SubtClass *klass); static void gst_mpeg2subt_init (GstMpeg2Subt *mpeg2subt); -static void gst_mpeg2subt_chain_video (GstPad *pad,GstBuffer *buf); -static void gst_mpeg2subt_chain_subtitle (GstPad *pad,GstBuffer *buf); +static void gst_mpeg2subt_chain_video (GstPad *pad,GstData *_data); +static void gst_mpeg2subt_chain_subtitle (GstPad *pad,GstData *_data); static void gst_mpeg2subt_merge_title (GstMpeg2Subt *mpeg2subt, GstBuffer *buf); @@ -152,8 +152,9 @@ gst_mpeg2subt_init (GstMpeg2Subt *mpeg2subt) } static void -gst_mpeg2subt_chain_video (GstPad *pad, GstBuffer *buf) +gst_mpeg2subt_chain_video (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstMpeg2Subt *mpeg2subt; guchar *data; glong size; @@ -172,7 +173,7 @@ gst_mpeg2subt_chain_video (GstPad *pad, GstBuffer *buf) mpeg2subt->duration--; } - gst_pad_push(mpeg2subt->srcpad, buf); + gst_pad_push(mpeg2subt->srcpad, GST_DATA (buf)); } @@ -346,8 +347,9 @@ next_line: } static void -gst_mpeg2subt_chain_subtitle (GstPad *pad, GstBuffer *buf) +gst_mpeg2subt_chain_subtitle (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstMpeg2Subt *mpeg2subt; guchar *data; glong size = 0; diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 920ab22c..b0a30806 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -97,7 +97,7 @@ static GstPadTemplate *sink_temp, *src_temp; static void gst_mp3parse_class_init (GstMPEGAudioParseClass *klass); static void gst_mp3parse_init (GstMPEGAudioParse *mp3parse); -static void gst_mp3parse_chain (GstPad *pad,GstBuffer *buf); +static void gst_mp3parse_chain (GstPad *pad,GstData *_data); static long bpf_from_header (GstMPEGAudioParse *parse, unsigned long header); static int head_check (unsigned long head); @@ -384,8 +384,9 @@ gst_mp3parse_init (GstMPEGAudioParse *mp3parse) } static void -gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) +gst_mp3parse_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstMPEGAudioParse *mp3parse; guchar *data; glong size,offset = 0; @@ -498,7 +499,7 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) GST_BUFFER_DURATION(outbuf) = 8 * (GST_SECOND/1000) * GST_BUFFER_SIZE(outbuf) / mp3parse->bit_rate; if (GST_PAD_CAPS (mp3parse->srcpad) != NULL) { - gst_pad_push(mp3parse->srcpad,outbuf); + gst_pad_push(mp3parse->srcpad,GST_DATA (outbuf)); } else { GST_DEBUG ("No capsnego yet, delaying buffer push"); gst_buffer_unref (outbuf); diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c index 79c061fa..5b141657 100644 --- a/gst/overlay/gstoverlay.c +++ b/gst/overlay/gstoverlay.c @@ -274,21 +274,21 @@ gst_overlay_loop (GstElement *element) overlay = GST_OVERLAY (element); - in1 = gst_pad_pull (overlay->sinkpad1); + in1 = GST_BUFFER (gst_pad_pull (overlay->sinkpad1)); if (GST_IS_EVENT (in1)) { - gst_pad_push (overlay->srcpad, in1); + gst_pad_push (overlay->srcpad, GST_DATA (in1)); /* FIXME */ return; } - in2 = gst_pad_pull (overlay->sinkpad2); + in2 = GST_BUFFER (gst_pad_pull (overlay->sinkpad2)); if (GST_IS_EVENT (in2)) { - gst_pad_push (overlay->srcpad, in2); + gst_pad_push (overlay->srcpad, GST_DATA (in2)); /* FIXME */ return; } - in3 = gst_pad_pull (overlay->sinkpad3); + in3 = GST_BUFFER (gst_pad_pull (overlay->sinkpad3)); if (GST_IS_EVENT (in3)) { - gst_pad_push (overlay->srcpad, in3); + gst_pad_push (overlay->srcpad, GST_DATA (in3)); /* FIXME */ return; } @@ -333,7 +333,7 @@ gst_overlay_loop (GstElement *element) gst_buffer_unref (in2); gst_buffer_unref (in3); - gst_pad_push (overlay->srcpad, out); + gst_pad_push (overlay->srcpad, GST_DATA (out)); } static void diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c index eb3e8cbb..9cfcfba6 100644 --- a/gst/passthrough/gstpassthrough.c +++ b/gst/passthrough/gstpassthrough.c @@ -95,7 +95,7 @@ static void passthrough_get_property (GObject *object, guint prop_id, GValue *v static GstPadLinkReturn passthrough_connect_sink (GstPad *pad, GstCaps *caps); -static void passthrough_chain (GstPad *pad, GstBuffer *buf); +static void passthrough_chain (GstPad *pad, GstData *_data); static void inline passthrough_fast_float_chain (gfloat* data, guint numsamples); static void inline passthrough_fast_16bit_chain (gint16* data, guint numsamples); static void inline passthrough_fast_8bit_chain (gint8* data, guint numsamples); @@ -213,8 +213,9 @@ passthrough_init (GstPassthrough *filter) } static void -passthrough_chain (GstPad *pad, GstBuffer *buf) +passthrough_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstPassthrough *filter; gint16 *int_data; gfloat *float_data; @@ -254,7 +255,7 @@ passthrough_chain (GstPad *pad, GstBuffer *buf) break; } - gst_pad_push (filter->srcpad, buf); + gst_pad_push (filter->srcpad, GST_DATA (buf)); } static void inline diff --git a/gst/playondemand/filter.func b/gst/playondemand/filter.func index 7c9f4de7..a07edf4e 100644 --- a/gst/playondemand/filter.func +++ b/gst/playondemand/filter.func @@ -6,7 +6,7 @@ filter_data = (_TYPE_ *) filter->buffer; num_filter = filter->buffer_bytes / sizeof(_TYPE_); do { - if (in == NULL && ! filter->eos) in = gst_pad_pull(filter->sinkpad); + if (in == NULL && ! filter->eos) in = GST_BUFFER (gst_pad_pull(filter->sinkpad)); /****************************************************************************/ /* see if we've got any events coming through ... */ @@ -23,10 +23,10 @@ do { filter->eos = FALSE; filter->write = 0; } else { - gst_pad_push(filter->srcpad, in); + gst_pad_push(filter->srcpad, GST_DATA (in)); } - in = gst_pad_pull(filter->sinkpad); + in = GST_BUFFER (gst_pad_pull(filter->sinkpad)); } /****************************************************************************/ @@ -114,7 +114,7 @@ do { /****************************************************************************/ /* push out the buffer. */ - gst_pad_push(filter->srcpad, out); + gst_pad_push(filter->srcpad, GST_DATA (out)); if (gst_element_interrupt (GST_ELEMENT (filter))) break; diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index 0876f7d0..b53d4be9 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -434,7 +434,7 @@ play_on_demand_loop (GstElement *elem) filter->bufpool = gst_buffer_pool_get_default(GST_POD_BUFPOOL_SIZE, GST_POD_BUFPOOL_NUM); - in = gst_pad_pull(filter->sinkpad); + in = GST_BUFFER (gst_pad_pull(filter->sinkpad)); if (filter->format == GST_PLAYONDEMAND_FORMAT_INT) { if (filter->width == 16) { diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index f5a95c03..dfd4b2c5 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -462,7 +462,7 @@ static void gst_qtdemux_loop_header (GstElement *element) if(index==-1){ for(i=0;i<qtdemux->n_streams;i++){ gst_pad_push(qtdemux->streams[i]->pad, - GST_BUFFER(gst_event_new (GST_EVENT_EOS))); + GST_DATA(gst_event_new (GST_EVENT_EOS))); } ret = gst_bytestream_seek(qtdemux->bs, 0, GST_SEEK_METHOD_END); GST_DEBUG ("seek returned %d",ret); @@ -516,7 +516,7 @@ static void gst_qtdemux_loop_header (GstElement *element) GST_BUFFER_TIMESTAMP(buf) = stream->samples[stream->sample_index].timestamp; GST_BUFFER_DURATION(buf) = stream->samples[stream->sample_index].duration; - gst_pad_push(stream->pad, buf); + gst_pad_push(stream->pad, GST_DATA (buf)); } stream->sample_index++; break; diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c index 03b41bd1..6ffa8287 100644 --- a/gst/rtjpeg/gstrtjpegdec.c +++ b/gst/rtjpeg/gstrtjpegdec.c @@ -51,7 +51,7 @@ enum { static void gst_rtjpegdec_class_init (GstRTJpegDecClass *klass); static void gst_rtjpegdec_init (GstRTJpegDec *rtjpegdec); -static void gst_rtjpegdec_chain (GstPad *pad, GstBuffer *buf); +static void gst_rtjpegdec_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_rtjpegdec_signals[LAST_SIGNAL] = { 0 }; */ @@ -98,8 +98,9 @@ gst_rtjpegdec_init (GstRTJpegDec *rtjpegdec) } static void -gst_rtjpegdec_chain (GstPad *pad, GstBuffer *buf) +gst_rtjpegdec_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstRTJpegDec *rtjpegdec; guchar *data; gulong size; @@ -114,5 +115,5 @@ gst_rtjpegdec_chain (GstPad *pad, GstBuffer *buf) gst_info("would be encoding frame here\n"); - gst_pad_push(rtjpegdec->srcpad,buf); + gst_pad_push(rtjpegdec->srcpad,GST_DATA (buf)); } diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c index b8757bf9..0aa90577 100644 --- a/gst/rtjpeg/gstrtjpegenc.c +++ b/gst/rtjpeg/gstrtjpegenc.c @@ -49,7 +49,7 @@ enum { static void gst_rtjpegenc_class_init (GstRTJpegEncClass *klass); static void gst_rtjpegenc_init (GstRTJpegEnc *rtjpegenc); -static void gst_rtjpegenc_chain (GstPad *pad, GstBuffer *buf); +static void gst_rtjpegenc_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_rtjpegenc_signals[LAST_SIGNAL] = { 0 }; */ @@ -96,8 +96,9 @@ gst_rtjpegenc_init (GstRTJpegEnc *rtjpegenc) } static void -gst_rtjpegenc_chain (GstPad *pad, GstBuffer *buf) +gst_rtjpegenc_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstRTJpegEnc *rtjpegenc; guchar *data; gulong size; @@ -112,5 +113,5 @@ gst_rtjpegenc_chain (GstPad *pad, GstBuffer *buf) gst_info("would be encoding frame here\n"); - gst_pad_push(rtjpegenc->srcpad,buf); + gst_pad_push(rtjpegenc->srcpad,GST_DATA (buf)); } diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index ec86c99d..0051ca1d 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -77,7 +77,7 @@ GST_PAD_TEMPLATE_FACTORY (smooth_sink_factory, static void gst_smooth_class_init (GstSmoothClass *klass); static void gst_smooth_init (GstSmooth *smooth); -static void gst_smooth_chain (GstPad *pad, GstBuffer *buf); +static void gst_smooth_chain (GstPad *pad, GstData *_data); static void smooth_filter (unsigned char* dest, unsigned char* src, int width, int height, int tolerance, int filtersize); @@ -218,8 +218,9 @@ smooth_filter (unsigned char* dest, unsigned char* src, int width, int height, i } static void -gst_smooth_chain (GstPad *pad, GstBuffer *buf) +gst_smooth_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSmooth *smooth; guchar *data; gulong size; @@ -233,7 +234,7 @@ gst_smooth_chain (GstPad *pad, GstBuffer *buf) smooth = GST_SMOOTH (GST_OBJECT_PARENT (pad)); if (!smooth->active) { - gst_pad_push(smooth->srcpad,buf); + gst_pad_push(smooth->srcpad,GST_DATA (buf)); return; } @@ -265,7 +266,7 @@ gst_smooth_chain (GstPad *pad, GstBuffer *buf) gst_buffer_unref (buf); - gst_pad_push (smooth->srcpad, outbuf); + gst_pad_push (smooth->srcpad, GST_DATA (outbuf)); } static void diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index a8b88496..5fcd79c0 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -56,7 +56,7 @@ static void gst_smoothwave_init (GstSmoothWave *smoothwave); static void gst_smoothwave_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_smoothwave_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_smoothwave_chain (GstPad *pad, GstBuffer *buf); +static void gst_smoothwave_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_smoothwave_signals[LAST_SIGNAL] = { 0 }; */ @@ -146,8 +146,9 @@ gst_smoothwave_init (GstSmoothWave *smoothwave) } static void -gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) +gst_smoothwave_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSmoothWave *smoothwave; gint16 *samples; gint samplecount,i; diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index bf042e4c..488d9515 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -323,18 +323,18 @@ gst_smpte_loop (GstElement *element) ts = smpte->position * GST_SECOND / smpte->fps; while (GST_PAD_IS_USABLE (smpte->sinkpad1) && in1 == NULL) { - in1 = gst_pad_pull (smpte->sinkpad1); + in1 = GST_BUFFER (gst_pad_pull (smpte->sinkpad1)); if (GST_IS_EVENT (in1)) { - gst_pad_push (smpte->srcpad, in1); + gst_pad_push (smpte->srcpad, GST_DATA (in1)); in1 = NULL; } else ts = GST_BUFFER_TIMESTAMP (in1); } if (GST_PAD_IS_USABLE (smpte->sinkpad2) && in2 == NULL) { - in2 = gst_pad_pull (smpte->sinkpad2); + in2 = GST_BUFFER (gst_pad_pull (smpte->sinkpad2)); if (GST_IS_EVENT (in2)) { - gst_pad_push (smpte->srcpad, in2); + gst_pad_push (smpte->srcpad, GST_DATA (in2)); in2 = NULL; } else @@ -390,7 +390,7 @@ gst_smpte_loop (GstElement *element) gst_buffer_unref (in2); GST_BUFFER_TIMESTAMP (outbuf) = ts; - gst_pad_push (smpte->srcpad, outbuf); + gst_pad_push (smpte->srcpad, GST_DATA (outbuf)); } static void diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c index 397b559b..1bd63ed4 100644 --- a/gst/spectrum/demo-osssrc.c +++ b/gst/spectrum/demo-osssrc.c @@ -3,7 +3,7 @@ extern gboolean _gst_plugin_spew; -void spectrum_chain(GstPad *pad,GstBuffer *buf); +void spectrum_chain(GstPad *pad,GstData *_data); gboolean idle_func(gpointer data); GtkWidget *drawingarea; @@ -62,7 +62,8 @@ int main(int argc,char *argv[]) { } -void spectrum_chain(GstPad *pad,GstBuffer *buf) { +void spectrum_chain(GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); gint i; guchar *data = buf->data; diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index 16786e33..5a2e8eb9 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -52,7 +52,7 @@ static void gst_spectrum_init (GstSpectrum *spectrum); static void gst_spectrum_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void gst_spectrum_chain (GstPad *pad, GstBuffer *buf); +static void gst_spectrum_chain (GstPad *pad, GstData *_data); #define fixed short int gst_spectrum_fix_fft(fixed fr[], fixed fi[], int m, int inverse); @@ -131,8 +131,9 @@ gst_spectrum_set_property (GObject *object, guint prop_id, const GValue *value, } static void -gst_spectrum_chain (GstPad *pad, GstBuffer *buf) +gst_spectrum_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstSpectrum *spectrum; gint spec_base, spec_len; gint16 *re, *im, *loud; @@ -188,7 +189,7 @@ gst_spectrum_chain (GstPad *pad, GstBuffer *buf) GST_BUFFER_DATA(newbuf) = spect; GST_BUFFER_SIZE(newbuf) = spectrum->width; - gst_pad_push(spectrum->srcpad,newbuf); + gst_pad_push(spectrum->srcpad,GST_DATA (newbuf)); } static gboolean diff --git a/gst/speed/filter.func b/gst/speed/filter.func index 867a825d..7bd5227c 100644 --- a/gst/speed/filter.func +++ b/gst/speed/filter.func @@ -38,11 +38,11 @@ i_float = i_float - nin; lower = in_data[nin-1]; gst_buffer_unref(in); - in = gst_pad_pull (filter->sinkpad); + in = GST_BUFFER (gst_pad_pull (filter->sinkpad)); while (GST_IS_EVENT (in)) { gst_pad_event_default (filter->srcpad, GST_EVENT (in)); - in = gst_pad_pull (filter->sinkpad); + in = GST_BUFFER (gst_pad_pull (filter->sinkpad)); } in_data = (_FORMAT*) GST_BUFFER_DATA(in); @@ -59,7 +59,7 @@ lower = in_data[i]; } - gst_pad_push(filter->srcpad, out); + gst_pad_push(filter->srcpad, GST_DATA (out)); gst_element_yield (element); } while (TRUE); diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index 294f50e7..f0a357ec 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -231,8 +231,9 @@ speed_loop (GstElement *element) i = j = 0; speed = filter->speed; + + in = GST_BUFFER (gst_pad_pull(filter->sinkpad)); - in = gst_pad_pull(filter->sinkpad); if (GST_IS_EVENT (in)) { gst_pad_event_default (filter->sinkpad, GST_EVENT (in)); return; @@ -240,7 +241,7 @@ speed_loop (GstElement *element) while (GST_IS_EVENT (in)) { gst_pad_event_default (filter->srcpad, GST_EVENT (in)); - in = gst_pad_pull (filter->sinkpad); + in = GST_BUFFER (gst_pad_pull (filter->sinkpad)); } /* this is a bit nasty, but hey, it's what you've got to do to keep the same diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c index 55f58996..2ff34092 100644 --- a/gst/stereo/gststereo.c +++ b/gst/stereo/gststereo.c @@ -53,7 +53,7 @@ static void gst_stereo_init (GstStereo *stereo); static void gst_stereo_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_stereo_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_stereo_chain (GstPad *pad, GstBuffer *buf); +static void gst_stereo_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; */ @@ -114,8 +114,9 @@ gst_stereo_init (GstStereo *stereo) } static void -gst_stereo_chain (GstPad *pad,GstBuffer *buf) +gst_stereo_chain (GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstStereo *stereo; gint16 *data; gint samples; @@ -162,7 +163,7 @@ gst_stereo_chain (GstPad *pad,GstBuffer *buf) /*} */ } - gst_pad_push(stereo->srcpad,buf); + gst_pad_push(stereo->srcpad,GST_DATA (buf)); } static void diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c index 731e64d4..bfd5aa34 100644 --- a/gst/vbidec/gstvbidec.c +++ b/gst/vbidec/gstvbidec.c @@ -139,7 +139,7 @@ static void gst_vbidec_set_property (GObject *object, guint prop_id, static void gst_vbidec_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gst_vbidec_chain (GstPad *pad, GstBuffer *buffer); +static void gst_vbidec_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_vbidec_signals[LAST_SIGNAL] = { 0 };*/ @@ -253,8 +253,9 @@ dvd_user_data_decode(GstVBIDec *vbidec, guint8 *data, guint32 size) } static void -gst_vbidec_chain (GstPad *pad, GstBuffer *buf) +gst_vbidec_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstVBIDec *vbidec = GST_VBIDEC (gst_pad_get_parent (pad)); guint32 size; guint8 *data; @@ -304,7 +305,7 @@ gst_vbidec_show_text (GstVBIDec *vbidec, char *text, int len) //GST_BUFFER_TIMESTAMP (buf) = vbidec->... //... //fprintf(stderr, "vbi text pushed\n"); - gst_pad_push (vbidec->srcpad, buf); + gst_pad_push (vbidec->srcpad, GST_DATA (buf)); } } } diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index dc67ceb1..4c731220 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -118,7 +118,7 @@ static void gst_video_crop_get_property (GObject *object, guint prop_id, static GstPadLinkReturn gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps); -static void gst_video_crop_chain (GstPad *pad, GstBuffer *buffer); +static void gst_video_crop_chain (GstPad *pad, GstData *_data); static GstElementStateReturn gst_video_crop_change_state (GstElement *element); @@ -345,8 +345,9 @@ gst_video_crop_i420 (GstVideoCrop *video_crop, GstBuffer *src_buffer, GstBuffer } static void -gst_video_crop_chain (GstPad *pad, GstBuffer *buffer) +gst_video_crop_chain (GstPad *pad, GstData *_data) { + GstBuffer *buffer = GST_BUFFER (_data); GstVideoCrop *video_crop; GstBuffer *outbuf; gint new_width, new_height; @@ -391,7 +392,7 @@ gst_video_crop_chain (GstPad *pad, GstBuffer *buffer) gst_video_crop_i420 (video_crop, buffer, outbuf); gst_buffer_unref (buffer); - gst_pad_push (video_crop->srcpad, outbuf); + gst_pad_push (video_crop->srcpad, GST_DATA (outbuf)); } static GstElementStateReturn diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c index 252d773b..5b8453b5 100644 --- a/gst/videodrop/gstvideodrop.c +++ b/gst/videodrop/gstvideodrop.c @@ -87,7 +87,7 @@ GST_PAD_TEMPLATE_FACTORY(sink_template, static void gst_videodrop_class_init (GstVideodropClass *klass); static void gst_videodrop_init (GstVideodrop *videodrop); -static void gst_videodrop_chain (GstPad *pad, GstBuffer *buf); +static void gst_videodrop_chain (GstPad *pad, GstData *_data); static GstElementClass *parent_class = NULL; /*static guint gst_videodrop_signals[LAST_SIGNAL] = { 0 }; */ @@ -199,8 +199,9 @@ gst_videodrop_init (GstVideodrop *videodrop) } static void -gst_videodrop_chain (GstPad *pad, GstBuffer *buf) +gst_videodrop_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstVideodrop *videodrop; GST_DEBUG ("gst_videodrop_chain"); @@ -212,7 +213,7 @@ gst_videodrop_chain (GstPad *pad, GstBuffer *buf) videodrop = GST_VIDEODROP (gst_pad_get_parent (pad)); if (GST_IS_EVENT (buf)) { - gst_pad_push (videodrop->srcpad, buf); + gst_pad_push (videodrop->srcpad, GST_DATA (buf)); return; } @@ -221,7 +222,7 @@ gst_videodrop_chain (GstPad *pad, GstBuffer *buf) (gfloat) videodrop->pass / videodrop->total) { videodrop->pass++; gst_buffer_ref (buf); - gst_pad_push (videodrop->srcpad, buf); + gst_pad_push (videodrop->srcpad, GST_DATA (buf)); } gst_buffer_unref (buf); diff --git a/gst/virtualdub/gstxsharpen.c b/gst/virtualdub/gstxsharpen.c index c7d5af7a..bc83ed62 100644 --- a/gst/virtualdub/gstxsharpen.c +++ b/gst/virtualdub/gstxsharpen.c @@ -86,7 +86,7 @@ static void gst_xsharpen_set_property (GObject * object, guint prop_id, static void gst_xsharpen_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void gst_xsharpen_chain (GstPad * pad, GstBuffer * buf); +static void gst_xsharpen_chain (GstPad * pad, GstData *_data); static GstElementClass *parent_class = NULL; @@ -167,8 +167,9 @@ gst_xsharpen_init (GstXsharpen * sharpen) } static void -gst_xsharpen_chain (GstPad * pad, GstBuffer * buf) +gst_xsharpen_chain (GstPad * pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstXsharpen *xsharpen; GstBuffer *outbuf; gint x, y; @@ -414,7 +415,7 @@ gst_xsharpen_chain (GstPad * pad, GstBuffer * buf) gst_buffer_unref (buf); - gst_pad_push (xsharpen->srcpad, outbuf); + gst_pad_push (xsharpen->srcpad, GST_DATA (outbuf)); } static void diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 9c413f08..66673109 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -83,7 +83,7 @@ static void gst_y4mencode_get_property (GObject *object, GParamSpec *pspec); static void gst_y4mencode_chain (GstPad *pad, - GstBuffer *buf); + GstData *_data); static GstElementStateReturn gst_y4mencode_change_state (GstElement *element); @@ -190,8 +190,9 @@ gst_y4mencode_init (GstY4mEncode *filter) } static void -gst_y4mencode_chain (GstPad *pad,GstBuffer *buf) +gst_y4mencode_chain (GstPad *pad,GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); GstY4mEncode *filter; GstBuffer* outbuf; gchar *header; @@ -225,7 +226,7 @@ gst_y4mencode_chain (GstPad *pad,GstBuffer *buf) gst_buffer_unref(buf); - gst_pad_push(filter->srcpad,outbuf); + gst_pad_push(filter->srcpad,GST_DATA (outbuf)); } static void diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c index e9142c3c..8d2044e3 100644 --- a/sys/dxr3/dxr3spusink.c +++ b/sys/dxr3/dxr3spusink.c @@ -97,7 +97,7 @@ static void dxr3spusink_set_clock (GstElement *element, GstClock *clock); static gboolean dxr3spusink_handle_event (GstPad *pad, GstEvent *event); -static void dxr3spusink_chain (GstPad *pad,GstBuffer *buf); +static void dxr3spusink_chain (GstPad *pad,GstData *_data); static GstElementStateReturn dxr3spusink_change_state (GstElement *element); @@ -381,8 +381,9 @@ dxr3spusink_handle_event (GstPad *pad, GstEvent *event) static void -dxr3spusink_chain (GstPad *pad, GstBuffer *buf) +dxr3spusink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); Dxr3SpuSink *sink; gint bytes_written = 0; diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 5f8f953d..843f33bc 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -133,7 +133,7 @@ static void dxr3videosink_write_data (Dxr3VideoSink *sink, static void dxr3videosink_parse_data (Dxr3VideoSink *sink); static gboolean dxr3videosink_handle_event (GstPad *pad, GstEvent *event); -static void dxr3videosink_chain (GstPad *pad,GstBuffer *buf); +static void dxr3videosink_chain (GstPad *pad,GstData *_data); static GstElementStateReturn dxr3videosink_change_state (GstElement *element); @@ -624,8 +624,9 @@ dxr3videosink_handle_event (GstPad *pad, GstEvent *event) static void -dxr3videosink_chain (GstPad *pad, GstBuffer *buf) +dxr3videosink_chain (GstPad *pad, GstData *_data) { + GstBuffer *buf = GST_BUFFER (_data); Dxr3VideoSink *sink; GstBuffer *merged; diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c index 2c730328..b7f1a6f9 100644 --- a/sys/qcam/gstqcamsrc.c +++ b/sys/qcam/gstqcamsrc.c @@ -123,7 +123,7 @@ static GstElementStateReturn gst_qcamsrc_change_state (GstElement *element); static void gst_qcamsrc_close (GstQCamSrc *src); static gboolean gst_qcamsrc_open (GstQCamSrc *src); -static GstBuffer* gst_qcamsrc_get (GstPad *pad); +static GstData* gst_qcamsrc_get (GstPad *pad); static GstElementClass *parent_class = NULL; /*//static guint gst_qcamsrc_signals[LAST_SIGNAL] = { 0 }; */ @@ -227,7 +227,7 @@ gst_qcamsrc_init (GstQCamSrc *qcamsrc) qcip_set_autoexposure_mode (qcamsrc->autoexposure); } -static GstBuffer* +static GstData* gst_qcamsrc_get (GstPad *pad) { GstQCamSrc *qcamsrc; @@ -275,7 +275,7 @@ gst_qcamsrc_get (GstPad *pad) memset (outdata+frame, 128, frame>>1); g_free (scan); - return buf; + return GST_DATA (buf); } static void diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 015e3c43..7a0094bd 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -74,7 +74,7 @@ static GstPadLinkReturn gst_v4l2src_srcconnect (GstPad *pad, GstCaps *caps); static GstCaps * gst_v4l2src_getcaps (GstPad *pad, GstCaps *caps); -static GstBuffer * gst_v4l2src_get (GstPad *pad); +static GstData * gst_v4l2src_get (GstPad *pad); /* get/set params */ static void gst_v4l2src_set_property (GObject *object, @@ -765,7 +765,7 @@ gst_v4l2src_getcaps (GstPad *pad, } -static GstBuffer* +static GstData* gst_v4l2src_get (GstPad *pad) { GstV4l2Src *v4l2src; @@ -874,7 +874,7 @@ gst_v4l2src_get (GstPad *pad) g_signal_emit(G_OBJECT(v4l2src), gst_v4l2src_signals[SIGNAL_FRAME_CAPTURE], 0); - return buf; + return GST_DATA (buf); } diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c index 272b530c..1ee3a83d 100644 --- a/sys/vcd/vcdsrc.c +++ b/sys/vcd/vcdsrc.c @@ -68,7 +68,7 @@ static void vcdsrc_init (VCDSrc *vcdsrc); static void vcdsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void vcdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GstBuffer * vcdsrc_get (GstPad *pad); +static GstData * vcdsrc_get (GstPad *pad); /*static GstBuffer * vcdsrc_get_region (GstPad *pad,gulong offset,gulong size); */ static GstElementStateReturn vcdsrc_change_state (GstElement *element); @@ -222,7 +222,7 @@ vcdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec * } } -static GstBuffer * +static GstData * vcdsrc_get (GstPad *pad) { VCDSrc *vcdsrc; @@ -266,7 +266,7 @@ vcdsrc_get (GstPad *pad) if (++error_count > vcdsrc->max_errors) { gst_element_set_eos (GST_ELEMENT (vcdsrc)); - return GST_BUFFER (gst_event_new (GST_EVENT_EOS)); + return GST_DATA (gst_event_new (GST_EVENT_EOS)); } fprintf (stderr, "%s while reading raw data from cdrom at %d:%d:%d\n", @@ -283,7 +283,7 @@ vcdsrc_get (GstPad *pad) GST_BUFFER_SIZE(buf) = vcdsrc->bytes_per_read; vcdsrc->curoffset += 1; - return buf; + return GST_DATA (buf); } /* open the file, necessary to go to RUNNING state */ |