From 1a9699c487eae4a1c54dd8802fae3ec594d117be Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Tue, 5 Aug 2008 15:05:44 +0000
Subject: [PATCH] gst/wavparse/gstwavparse.c: Handle the list chunk and use
 gst_riff_parse_info() to parse the info sub-chunk.

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.
---
 ChangeLog                  |  6 ++++
 gst/wavparse/gstwavparse.c | 67 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fce671a8c5..98af8d283b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* gst/wavparse/gstwavparse.c:
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index fde7dbc3de..8f87c2d55b 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1255,7 +1255,6 @@ gst_wavparse_stream_headers (GstWavParse * wav)
      * So we have to go bit by bit until we find the 'data' header
      */
     switch (tag) {
-        /* TODO : Implement the various cases */
       case GST_RIFF_TAG_data:{
         GstFormat fmt;
 
@@ -1349,6 +1348,72 @@ gst_wavparse_stream_headers (GstWavParse * wav)
           wav->offset += 8 + data_size;
         }
         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:
         gst_waveparse_ignore_chunk (wav, buf, tag, size);