[gst-cvs] gst-plugins-ugly: amrwbdec: avoid stalling on invalid frame

[<mn...@ke...>]

Module: gst-plugins-ugly
Branch: master
Commit: dbdf9761055001f07957353dc0b468fb7e192d40
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=dbdf9761055001f07957353dc0b468fb7e192d40

Author: Mark Nauwelaerts <mar...@co...>
Date:   Mon Feb  7 19:58:45 2011 +0100

amrwbdec: avoid stalling on invalid frame

Skip 1 byte indicating invalid frame type index rather than stalling
on it indefinitely until EOS.

Fixes #639715.

---

 ext/amrwbdec/amrwbdec.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ext/amrwbdec/amrwbdec.c b/ext/amrwbdec/amrwbdec.c
index bbaf33b..51f759d 100644
--- a/ext/amrwbdec/amrwbdec.c
+++ b/ext/amrwbdec/amrwbdec.c
@@ -63,7 +63,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_amrwbdec_debug);
 
 static const unsigned char block_size[16] =
     { 18, 24, 33, 37, 41, 47, 51, 59, 61,
-  6, 6, 0, 0, 0, 1, 1
+  6, 0, 0, 0, 0, 1, 1
 };
 
 static gboolean gst_amrwbdec_event (GstPad * pad, GstEvent * event);
@@ -285,7 +285,13 @@ gst_amrwbdec_chain (GstPad * pad, GstBuffer * buffer)
 
     GST_DEBUG_OBJECT (amrwbdec, "mode %d, block %d", mode, block);
 
-    if (!block || gst_adapter_available (amrwbdec->adapter) < block)
+    if (!block) {
+      GST_LOG_OBJECT (amrwbdec, "skipping byte");
+      gst_adapter_flush (amrwbdec->adapter, 1);
+      continue;
+    }
+
+    if (gst_adapter_available (amrwbdec->adapter) < block)
       break;
 
     /* the library seems to write into the source data, hence the copy. */