diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-19 22:42:21 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-19 22:42:21 +0000 |
| commit | 99c4af365e4ecbb6d4a0f940b813bf3d209a3d65 (patch) | |
| tree | a8b5dcac917ec7d1a822852a567f24db15573360 /gst-libs | |
| parent | 4242476d37bfcf7c7b2f9a525a932b8b1eb50eac (diff) | |
gst-libs/gst/riff/riff-read.*: Add _peek version (req'ed in CDXA).
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.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/riff/riff-read.c | 24 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-read.h | 3 |
2 files changed, 22 insertions, 5 deletions
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 4d379a7b..fbbbae26 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -260,7 +260,7 @@ gst_riff_peek_head (GstRiffRead * riff, */ 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; guint32 got; @@ -272,14 +272,28 @@ gst_riff_read_element_data (GstRiffRead * riff, guint length, guint * got_bytes) 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 */ if (length & 1) length++; - gst_bytestream_flush (riff->bs, length); - - if (got_bytes) - *got_bytes = got; + if (!gst_bytestream_flush (riff->bs, length)) { + gst_buffer_unref (buf); + return NULL; + } return buf; } diff --git a/gst-libs/gst/riff/riff-read.h b/gst-libs/gst/riff/riff-read.h index d44c4ed7..a0c12606 100644 --- a/gst-libs/gst/riff/riff-read.h +++ b/gst-libs/gst/riff/riff-read.h @@ -85,6 +85,9 @@ gboolean gst_riff_read_header (GstRiffRead *read, GstBuffer *gst_riff_read_element_data (GstRiffRead *riff, guint length, guint *got_bytes); +GstBuffer *gst_riff_peek_element_data (GstRiffRead *riff, + guint length, + guint *got_bytes); /* * Utility functions (including byteswapping). */ |