mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-09 07:52:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Trivial fixes for GstBuffer->GstData migration

Browse source 
Original commit message from CVS:
Trivial fixes for GstBuffer->GstData migration
This commit is contained in:
David Schleef 2003-10-09 02:23:01 +00:00
parent d9b79beab1
commit 8b3c0de75a
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/dvdnav/dvdnavsrc.c
View file

@ -853,12 +853,12 @@ dvdnavsrc_get (GstPad *pad)
GST_DEBUG ("dvdnavsrc sending discont"); GST_DEBUG ("dvdnavsrc sending discont");
event = gst_event_new_discontinuous (FALSE, 0); event = gst_event_new_discontinuous (FALSE, 0);
src->need_flush = FALSE; src->need_flush = FALSE;
return GST_BUFFER (event); return GST_DATA (event);
} }
if (src->need_flush) { if (src->need_flush) {
src->need_flush = FALSE; src->need_flush = FALSE;
GST_DEBUG ("dvdnavsrc sending flush"); GST_DEBUG ("dvdnavsrc sending flush");
return GST_BUFFER (gst_event_new_flush()); return GST_DATA (gst_event_new_flush());
} }
/* loop processing blocks until data is pushed */ /* loop processing blocks until data is pushed */
@ -927,7 +927,7 @@ dvdnavsrc_get (GstPad *pad)
break; break;
} }
} }
return buf; return GST_DATA(buf);
} }
/* open the file, necessary to go to RUNNING state */ /* open the file, necessary to go to RUNNING state */

17
ext/sidplay/gstsiddec.cc
View file

@ -401,13 +401,14 @@ gst_siddec_loop (GstElement *element)
siddec = GST_SIDDEC (element); siddec = GST_SIDDEC (element);
if (siddec->state == SID_STATE_NEED_TUNE) { if (siddec->state == SID_STATE_NEED_TUNE) {
GstBuffer *buf = gst_pad_pull (siddec->sinkpad); GstData *data = gst_pad_pull (siddec->sinkpad);
g_assert (buf != NULL);
if (GST_IS_EVENT (buf)) {
GstEvent *event = GST_EVENT (buf);
switch (GST_EVENT_TYPE (buf)) { g_assert (data != NULL);
if (GST_IS_EVENT (data)) {
GstEvent *event = GST_EVENT (data);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS: case GST_EVENT_EOS:
siddec->state = SID_STATE_LOAD_TUNE; siddec->state = SID_STATE_LOAD_TUNE;
break; break;
@ -423,6 +424,8 @@ gst_siddec_loop (GstElement *element)
gst_event_unref (event); gst_event_unref (event);
} }
else { else {
GstBuffer *buf = GST_BUFFER (data);
memcpy (siddec->tune_buffer+siddec->tune_len, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); memcpy (siddec->tune_buffer+siddec->tune_len, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
siddec->tune_len += GST_BUFFER_SIZE (buf); siddec->tune_len += GST_BUFFER_SIZE (buf);
@ -475,7 +478,7 @@ gst_siddec_loop (GstElement *element)
gst_siddec_src_query (siddec->srcpad, GST_QUERY_POSITION, &format, &value2); gst_siddec_src_query (siddec->srcpad, GST_QUERY_POSITION, &format, &value2);
GST_BUFFER_DURATION (out) = value2 - value; GST_BUFFER_DURATION (out) = value2 - value;
gst_pad_push (siddec->srcpad, out); gst_pad_push (siddec->srcpad, GST_DATA(out));
} }
} }