mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/wavparse/gstwavparse.c: Handle the list chunk and use gst_riff_parse_info() to parse the info sub-chunk.

Browse source 
Original commit message from CVS:
* gst/wavparse/gstwavparse.c:
Handle the list chunk and use gst_riff_parse_info() to parse the info
sub-chunk.
This commit is contained in:
Stefan Kost 2008-08-05 15:05:44 +00:00
parent 8e98d264cd
commit 1a9699c487
2 changed files with 72 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-05 Stefan Kost <ensonic@users.sf.net>
* gst/wavparse/gstwavparse.c:
Handle the list chunk and use gst_riff_parse_info() to parse the info
sub-chunk.
2008-08-05 Stefan Kost <ensonic@users.sf.net> 2008-08-05 Stefan Kost <ensonic@users.sf.net>
* gst/wavparse/gstwavparse.c: * gst/wavparse/gstwavparse.c:

67
gst/wavparse/gstwavparse.c
View file

@ -1255,7 +1255,6 @@ gst_wavparse_stream_headers (GstWavParse * wav)
* So we have to go bit by bit until we find the 'data' header * So we have to go bit by bit until we find the 'data' header
*/ */
switch (tag) { switch (tag) {
/* TODO : Implement the various cases */
case GST_RIFF_TAG_data:{ case GST_RIFF_TAG_data:{
GstFormat fmt; GstFormat fmt;
@ -1349,6 +1348,72 @@ gst_wavparse_stream_headers (GstWavParse * wav)
wav->offset += 8 + data_size; wav->offset += 8 + data_size;
} }
break; break;
}
/* FIXME: all list tags after data are ignored in streaming mode */
case GST_RIFF_TAG_LIST:{
guint32 ltag;
if (wav->streaming) {
const guint8 *data = NULL;
if (gst_adapter_available (wav->adapter) < 12) {
return GST_FLOW_OK;
}
data = gst_adapter_peek (wav->adapter, 12);
ltag = GST_READ_UINT32_LE (data + 8);
} else {
gst_buffer_unref (buf);
if ((res =
gst_pad_pull_range (wav->sinkpad, wav->offset, 12,
&buf)) != GST_FLOW_OK)
goto header_read_error;
ltag = GST_READ_UINT32_LE (GST_BUFFER_DATA (buf) + 8);
}
switch (ltag) {
case GST_RIFF_LIST_INFO:{
const guint data_size = size - 12;
GstTagList *new;
GST_INFO_OBJECT (wav, "Have LIST chunk INFO");
if (wav->streaming) {
gst_adapter_flush (wav->adapter, 12);
if (gst_adapter_available (wav->adapter) < data_size) {
return GST_FLOW_OK;
}
gst_buffer_unref (buf);
buf = gst_adapter_take_buffer (wav->adapter, data_size);
} else {
wav->offset += 12;
gst_buffer_unref (buf);
if ((res =
gst_pad_pull_range (wav->sinkpad, wav->offset, data_size,
&buf)) != GST_FLOW_OK)
goto header_read_error;
}
/* parse tags */
gst_riff_parse_info (GST_ELEMENT (wav), buf, &new);
if (new) {
GstTagList *old = wav->tags;
wav->tags = gst_tag_list_merge (old, new, GST_TAG_MERGE_REPLACE);
if (old)
gst_tag_list_free (old);
gst_tag_list_free (new);
}
if (wav->streaming) {
gst_adapter_flush (wav->adapter, data_size);
} else {
gst_buffer_unref (buf);
wav->offset += data_size;
}
break;
}
default:
GST_INFO_OBJECT (wav, "Ignoring LIST chunk %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (ltag));
gst_waveparse_ignore_chunk (wav, buf, tag, size);
break;
}
break;
} }
default: default:
gst_waveparse_ignore_chunk (wav, buf, tag, size); gst_waveparse_ignore_chunk (wav, buf, tag, size);