summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02aca4e)
raw | patch | inline | side by side (parent: 02aca4e)
author | Andy Wingo <wingo@pobox.com> | |
Wed, 8 Oct 2003 16:08:10 +0000 (16:08 +0000) | ||
committer | Andy Wingo <wingo@pobox.com> | |
Wed, 8 Oct 2003 16:08:10 +0000 (16:08 +0000) |
Original commit message from CVS:
/GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
/GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
16 files changed:
index b7abb510aa14e8692df39ea8c2c758e37d8a8d8a..e903f88a7388f0b463204ea1f960a4ace840175b 160000 (submodule)
--- a/common
+++ b/common
-Subproject commit b7abb510aa14e8692df39ea8c2c758e37d8a8d8a
+Subproject commit e903f88a7388f0b463204ea1f960a4ace840175b
diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index a3f5be0c4c723c3c5fe05731e97feea14a6e3318..e23c33e48f07c82130dadda331092172ee34aa28 100644 (file)
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@ -351,7 +351,7 @@ gst_a52dec_push (GstPad * srcpad, int flags, sample_t * _samples, gint64 timesta
GST_BUFFER_TIMESTAMP (buf) = timestamp;
float_to_int (samples, (int16_t *) GST_BUFFER_DATA (buf), flags);
- gst_pad_push (srcpad, buf);
+ gst_pad_push (srcpad, GST_DATA (buf));
return 0;
}
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index 367843ff620a0833e7f2a4feb4d9431f4e58ef12..4a4a78c5d519c04c7ad227c4e8c795ddc7cf615c 100644 (file)
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
static void dvdnavsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void dvdnavsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static GstBuffer * dvdnavsrc_get (GstPad *pad);
+static GstData * dvdnavsrc_get (GstPad *pad);
/*static GstBuffer * dvdnavsrc_get_region (GstPad *pad,gulong offset,gulong size); */
static gboolean dvdnavsrc_event (GstPad *pad, GstEvent *event);
static const GstEventMask*
}
}
-static GstBuffer *
+static GstData *
dvdnavsrc_get (GstPad *pad)
{
DVDNavSrc *src;
index ddb33aab95e6fd1e8b45f1b1621d6f48745ee4ae..73df1fb0520bc332b7a04ccb22a88f66f8f795a3 100644 (file)
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
static void dvdreadsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void dvdreadsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-/*static GstBuffer * dvdreadsrc_get (GstPad *pad); */
+/*static GstData * dvdreadsrc_get (GstPad *pad); */
static void dvdreadsrc_loop (GstElement *element);
/*static GstBuffer * dvdreadsrc_get_region (GstPad *pad,gulong offset,gulong size); */
}
GST_BUFFER_SIZE(buf) = cur_output_size * DVD_VIDEO_LB_LEN;
- gst_pad_push(priv->srcpad, buf);
+ gst_pad_push(priv->srcpad, GST_DATA (buf));
priv->cur_pack = next_vobu;
}
}
return 0;
}
-static GstBuffer *
+static GstData *
dvdreadsrc_get (GstPad *pad)
{
DVDReadSrc *dvdreadsrc;
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index e586fdcc83cb44c8e516ec4eb2985e5afe61adfe..38c668dd840f9b142f6fafaf94cb46adc5933611 100644 (file)
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
const GValue *value, GParamSpec *pspec);
static void gst_lame_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec);
-static void gst_lame_chain (GstPad *pad, GstBuffer *buf);
+static void gst_lame_chain (GstPad *pad, GstData *_data);
static gboolean gst_lame_setup (GstLame *lame);
static GstElementStateReturn gst_lame_change_state (GstElement *element);
@@ -715,8 +715,9 @@ gst_lame_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
}
static void
-gst_lame_chain (GstPad *pad, GstBuffer *buf)
+gst_lame_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buf = GST_BUFFER (_data);
GstLame *lame;
GstBuffer *outbuf;
gchar *mp3_data = NULL;
GST_BUFFER_OFFSET (outbuf) = lame->last_offs;
GST_BUFFER_DURATION (outbuf) = lame->last_duration;
- gst_pad_push (lame->srcpad,outbuf);
+ gst_pad_push (lame->srcpad,GST_DATA (outbuf));
lame->last_ts = GST_CLOCK_TIME_NONE;
}
}
if (eos) {
- gst_pad_push (lame->srcpad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
+ gst_pad_push (lame->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS))));
gst_element_set_eos (GST_ELEMENT (lame));
}
}
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 41e61e12201fc21717df45d4d1123451b32af543..01aac7d7233b70eb0b2a1dc44cd67d9ac5a52f2c 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
gint64 src_value, GstFormat
*dest_format, gint64 *dest_value);
-static void gst_mad_chain (GstPad *pad, GstBuffer *buffer);
+static void gst_mad_chain (GstPad *pad, GstData *_data);
static GstElementStateReturn
gst_mad_change_state (GstElement *element);
{
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
time, NULL);
- gst_pad_push (mad->srcpad, GST_BUFFER (discont));
+ gst_pad_push (mad->srcpad, GST_DATA (discont));
}
break;
}
}
static void
-gst_mad_chain (GstPad *pad, GstBuffer *buffer)
+gst_mad_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buffer = GST_BUFFER (_data);
GstMad *mad;
gchar *data;
glong size;
}
}
- gst_pad_push (mad->srcpad, outbuffer);
+ gst_pad_push (mad->srcpad, GST_DATA (outbuffer));
}
mad->total_samples += nsamples;
index 3c1506665fedc29a71977fc4366379051f8da0fa..55560edc14112c70b0f28c7021b89c1e92ee42f3 100644 (file)
static GstElementStateReturn
gst_mpeg2dec_change_state (GstElement *element);
-static void gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buffer);
+static void gst_mpeg2dec_chain (GstPad *pad, GstData *_data);
static GstElementClass *parent_class = NULL;
/*static guint gst_mpeg2dec_signals[LAST_SIGNAL] = { 0 };*/
}
static void
-gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf)
+gst_mpeg2dec_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buf = GST_BUFFER (_data);
GstMpeg2dec *mpeg2dec = GST_MPEG2DEC (gst_pad_get_parent (pad));
guint32 size;
guint8 *data, *end;
else {
/* TODO set correct offset here based on frame number */
GST_BUFFER_DURATION (outbuf) = mpeg2dec->frame_period;
- gst_pad_push (mpeg2dec->srcpad, outbuf);
+ gst_pad_push (mpeg2dec->srcpad, GST_DATA (outbuf));
}
}
if (info->discard_fbuf && info->discard_fbuf->id) {
memcpy (GST_BUFFER_DATA (udbuf), info->user_data, info->user_data_len);
- gst_pad_push (mpeg2dec->userdatapad, udbuf);
+ gst_pad_push (mpeg2dec->userdatapad, GST_DATA (udbuf));
}
}
}
index da7f751886da4b69b9f348837628408ac92c78c0..570420d78fac6ac504163563470be62d12db470f 100644 (file)
static void gst_ac3parse_init (GstAc3Parse *ac3parse);
static void gst_ac3parse_chain (GstPad *pad,
- GstBuffer *buf);
+ GstData *data);
static void gst_ac3parse_set_property (GObject *object,
guint prop_id,
}
static void
-gst_ac3parse_chain (GstPad *pad, GstBuffer *buf)
+gst_ac3parse_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buf = GST_BUFFER (_data);
GstAc3Parse *ac3parse;
guchar *data;
glong size,offset = 0;
offset += bpf;
if (ac3parse->skip == 0 && GST_PAD_IS_LINKED(ac3parse->srcpad)) {
GST_DEBUG ("ac3parse: pushing buffer of %d bytes",GST_BUFFER_SIZE(outbuf));
- gst_pad_push(ac3parse->srcpad,outbuf);
+ gst_pad_push(ac3parse->srcpad,GST_DATA (outbuf));
}
else {
GST_DEBUG ("ac3parse: skipping buffer of %d bytes",GST_BUFFER_SIZE(outbuf));
index 5788e28a0da87944f3bc83d755eb2ad21114ceab..aefe8c33539b294751d82082463ef42e2c1804eb 100644 (file)
GST_DEBUG ("Sending strem %d of size %d", stream->id , segment_info->chunk_size);
GST_INFO ( "Pushing pad");
- gst_pad_push (stream->pad, stream->payload);
+ gst_pad_push (stream->pad, GST_DATA (stream->payload));
}
stream->frag_offset = 0;
asf_demux->last_seek, stream->delay, asf_demux->last_seek + stream->delay);
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
asf_demux->last_seek + stream->delay , NULL);
- gst_pad_push (stream->pad, GST_BUFFER (discont));
+ gst_pad_push (stream->pad, GST_DATA (discont));
}
}
break;
index 90b9d1637f14182fe03fc081bfa587f479b53bed..90b3cb22b9ba4971a122b452da40f5d76c6a3a20 100644 (file)
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
stream->connected == TRUE &&
GST_PAD_IS_USABLE (stream->pad) &&
stream->eos == FALSE) {
- buffer = gst_pad_pull (stream->pad);
+ buffer = GST_BUFFER (gst_pad_pull (stream->pad));
if (GST_IS_EVENT (buffer)) {
gst_asfmux_handle_event (stream->pad, GST_EVENT (buffer));
} else {
gst_asfmux_put_flush (GstAsfMux *asfmux)
{
gst_pad_push (asfmux->srcpad,
- GST_BUFFER (gst_event_new_flush ()));
+ GST_DATA (gst_event_new_flush ()));
}
/* write an asf chunk (only used in streaming case) */
gst_asfmux_put_byte (header, 1); /* ??? */
gst_asfmux_put_byte (header, 1); /* ??? */
- gst_pad_push (asfmux->srcpad, header);
+ gst_pad_push (asfmux->srcpad, GST_DATA (header));
asfmux->write_header = FALSE;
}
GstBuffer *footer = gst_buffer_new_and_alloc (16);
GST_BUFFER_SIZE (footer) = 0;
gst_asfmux_put_chunk (footer, asfmux, 0x4524, 0, 0); /* end of stream */
- gst_pad_push (asfmux->srcpad, footer);
+ gst_pad_push (asfmux->srcpad, GST_DATA (footer));
} else if (gst_asfmux_can_seek (asfmux)) {
/* rewrite an updated header */
guint64 filesize;
gst_pad_query (asfmux->srcpad, GST_QUERY_POSITION,
&fmt, &filesize);
event = gst_event_new_seek (GST_SEEK_METHOD_SET | GST_FORMAT_BYTES, 0);
- gst_pad_push (asfmux->srcpad, GST_BUFFER (event));
+ gst_pad_push (asfmux->srcpad, GST_DATA (event));
gst_asfmux_file_start (asfmux, filesize, filesize - asfmux->data_offset);
event = gst_event_new_seek (GST_SEEK_METHOD_SET | GST_FORMAT_BYTES, filesize);
- gst_pad_push (asfmux->srcpad, GST_BUFFER (event));
+ gst_pad_push (asfmux->srcpad, GST_DATA (event));
}
gst_asfmux_put_flush (asfmux);
GST_BUFFER_SIZE (packet) = GST_ASF_PACKET_SIZE - header_size;
/* send packet over */
- gst_pad_push (asfmux->srcpad, header);
- gst_pad_push (asfmux->srcpad, packet);
+ gst_pad_push (asfmux->srcpad, GST_DATA (header));
+ gst_pad_push (asfmux->srcpad, GST_DATA (packet));
gst_asfmux_put_flush (asfmux);
asfmux->num_packets++;
asfmux->packet_frames = 0;
/* simply finish off the file and send EOS */
gst_asfmux_file_stop (asfmux);
gst_pad_push (asfmux->srcpad,
- GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
+ GST_DATA (gst_event_new (GST_EVENT_EOS)));
gst_element_set_eos (GST_ELEMENT(asfmux));
return FALSE;
}
index 920ab22c25588641c0659b949497a2ed8960641b..b0a308065ff2eafcec21e2de1e964bd711152612 100644 (file)
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);
}
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;
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);
index 9c81db003aa65cbaf8533cc81c08fa641e32bd90..b651b1c82383c3a1a67563b442df6e663c9da69f 100644 (file)
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
current_time, NULL);
- gst_pad_push (mpeg_demux->video_stream[i]->pad, GST_BUFFER (discont));
+ gst_pad_push (mpeg_demux->video_stream[i]->pad, GST_DATA (discont));
}
if (mpeg_demux->audio_stream[i] &&
GST_PAD_IS_USABLE (mpeg_demux->audio_stream[i]->pad))
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
current_time, NULL);
- gst_pad_push (mpeg_demux->audio_stream[i]->pad, GST_BUFFER (discont));
+ gst_pad_push (mpeg_demux->audio_stream[i]->pad, GST_DATA (discont));
}
}
}
event = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
MPEGTIME_TO_GSTTIME (time), NULL);
- gst_pad_push (*outpad, GST_BUFFER (event));
+ gst_pad_push (*outpad, GST_DATA (event));
}
}
else {
GST_DEBUG ("pushing buffer of len %d id %d, ts %" G_GINT64_FORMAT,
datalen, id, GST_BUFFER_TIMESTAMP (outbuf));
- gst_pad_push (outpad, outbuf);
+ gst_pad_push (outpad, GST_DATA (outbuf));
}
return TRUE;
GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET (buffer) + headerlen + 4;
- gst_pad_push(*outpad,outbuf);
+ gst_pad_push(*outpad, GST_DATA (outbuf));
}
}
index 9d09390057c09ddcefededf6eb4f6b944d48e6f8..df7d0c4c382908dc052ee5a9dbb732290553e94b 100644 (file)
GST_DEBUG ("current_scr %" G_GINT64_FORMAT, time);
if (GST_PAD_IS_USABLE (mpeg_parse->srcpad))
- gst_pad_push (mpeg_parse->srcpad, GST_BUFFER (data));
+ gst_pad_push (mpeg_parse->srcpad, GST_DATA (data));
else
gst_data_unref (data);
}
MPEGTIME_TO_GSTTIME (mpeg_parse->current_scr), NULL);
if (GST_PAD_IS_USABLE (mpeg_parse->srcpad))
- gst_pad_push (mpeg_parse->srcpad, GST_BUFFER (event));
+ gst_pad_push (mpeg_parse->srcpad, GST_DATA (event));
else
gst_event_unref (event);
}
index 1423fa5d8241c05fb3f031269eeb2248a480eabe..c64029072e5df64e3b21e1add742c30391041666 100644 (file)
gst_rfc2250_enc_new_buffer (GstRFC2250Enc *enc)
{
if (enc->packet) {
- gst_pad_push (enc->srcpad, enc->packet);
+ gst_pad_push (enc->srcpad, GST_DATA (enc->packet));
}
enc->packet = gst_buffer_new ();
enc->flags = 0;
}
else {
if (enc->packet) {
- gst_pad_push (enc->srcpad, enc->packet);
+ gst_pad_push (enc->srcpad, GST_DATA (enc->packet));
enc->packet = NULL;
enc->flags = 0;
enc->remaining = enc->MTU;
index 1efe2514be8a7082c71b918fa6788a09e517d465..7fb97b4210873d62865a5c50908c03f703ca4c18 100644 (file)
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
for(i=0;i<rmdemux->n_streams;i++){
GstPad *pad = rmdemux->streams[i]->pad;
if(pad){
- gst_pad_push(pad, GST_BUFFER(gst_event_new(GST_EVENT_EOS)));
+ gst_pad_push(pad, GST_DATA(gst_event_new(GST_EVENT_EOS)));
}
}
stream = gst_rmdemux_get_stream_by_id(rmdemux, id);
if(stream->pad){
- gst_pad_push(stream->pad, buffer);
+ gst_pad_push(stream->pad, GST_DATA (buffer));
}
rmdemux->chunk_index++;
index 5cd4a830532489e83dd7fc85aee7f850242b358f..ab59b0bef743cda3546a8ea29cd83954432ffa54 100644 (file)
static void gst_synaesthesia_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec);
-static void gst_synaesthesia_chain (GstPad *pad, GstBuffer *buf);
+static void gst_synaesthesia_chain (GstPad *pad, GstData *_data);
static GstElementStateReturn
gst_synaesthesia_change_state (GstElement *element);
}
static void
-gst_synaesthesia_chain (GstPad *pad, GstBuffer *bufin)
+gst_synaesthesia_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *bufin = GST_BUFFER (_data);
GstSynaesthesia *synaesthesia;
GstBuffer *bufout;
guint32 samples_in;
synaesthesia->next_time += GST_SECOND / synaesthesia->fps;
- gst_pad_push (synaesthesia->srcpad, bufout);
+ gst_pad_push (synaesthesia->srcpad, GST_DATA (bufout));
gst_buffer_unref (bufin);