mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/riff/riff-read.*: Add _peek version (req'ed in CDXA).

Browse source 
Original commit message from CVS:
* gst-libs/gst/riff/riff-read.c: (gst_riff_peek_element_data),
(gst_riff_read_element_data):
* gst-libs/gst/riff/riff-read.h:
Add _peek version (req'ed in CDXA).
* gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_init),
(gst_cdxaparse_loop):
Fix parsing in playbin.
* gst/playback/gstdecodebin.c: (close_pad_link):
Ignore current_ pads, they cause major annoyance.
This commit is contained in:
Ronald S. Bultje 2005-01-19 22:42:21 +00:00
parent 4242476d37
commit 99c4af365e
3 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_peek_element_data),
(gst_riff_read_element_data):
* gst-libs/gst/riff/riff-read.h:
Add _peek version (req'ed in CDXA).
* gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_init),
(gst_cdxaparse_loop):
Fix parsing in playbin.
* gst/playback/gstdecodebin.c: (close_pad_link):
Ignore current_ pads, they cause major annoyance.
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsasink.c: (gst_alsa_sink_loop): * ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):

24
gst-libs/gst/riff/riff-read.c
View file

@ -260,7 +260,7 @@ gst_riff_peek_head (GstRiffRead * riff,
*/ */
GstBuffer * GstBuffer *
gst_riff_read_element_data (GstRiffRead * riff, guint length, guint * got_bytes) gst_riff_peek_element_data (GstRiffRead * riff, guint length, guint * got_bytes)
{ {
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guint32 got; guint32 got;
@ -272,14 +272,28 @@ gst_riff_read_element_data (GstRiffRead * riff, guint length, guint * got_bytes)
return NULL; return NULL;
} }
if (got_bytes)
*got_bytes = got;
return buf;
}
GstBuffer *
gst_riff_read_element_data (GstRiffRead * riff, guint length, guint * got_bytes)
{
GstBuffer *buf;
if (!(buf = gst_riff_peek_element_data (riff, length, got_bytes)))
return NULL;
/* we need 16-bit alignment */ /* we need 16-bit alignment */
if (length & 1) if (length & 1)
length++; length++;
gst_bytestream_flush (riff->bs, length); if (!gst_bytestream_flush (riff->bs, length)) {
gst_buffer_unref (buf);
if (got_bytes) return NULL;
*got_bytes = got; }
return buf; return buf;
} }

3
gst-libs/gst/riff/riff-read.h
View file

@ -85,6 +85,9 @@ gboolean gst_riff_read_header (GstRiffRead *read,
GstBuffer *gst_riff_read_element_data (GstRiffRead *riff, GstBuffer *gst_riff_read_element_data (GstRiffRead *riff,
guint length, guint length,
guint *got_bytes); guint *got_bytes);
GstBuffer *gst_riff_peek_element_data (GstRiffRead *riff,
guint length,
guint *got_bytes);
/* /*
* Utility functions (including byteswapping). * Utility functions (including byteswapping).
*/ */