Ticket #8382: Faad.Patch

diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index b9de36d..bb49da1 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -210,6 +210,7 @@ gst_faad_init (GstFaad * faad)
   faad->handle = NULL;
   faad->samplerate = -1;
   faad->channels = -1;
+  faad->fr_channels = 0;
   faad->tempbuf = NULL;
   faad->need_channel_setup = TRUE;
   faad->channel_positions = NULL;
@@ -1115,6 +1116,8 @@ gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info)
   gboolean channel_map_failed;
   GstCaps *caps;
 
+  GST_DEBUG_OBJECT (faad, "update_caps. ch:%d->%d sr:%d->%d",
+      faad->channels, info->channels, faad->samplerate, info->samplerate);
   /* store new negotiation information */
   faad->samplerate = info->samplerate;
   faad->channels = info->channels;
@@ -1193,6 +1196,9 @@ gst_faad_sync (GstBuffer * buf, guint * off)
       *off = n;
       len = ((data[n + 3] & 0x03) << 11) |
           (data[n + 4] << 3) | ((data[n + 5] & 0xe0) >> 5);
+      // rescue un-labled framed input 
+      if (!n && n + len + 2 == size)
+        return TRUE;
       if (n + len + 2 >= size) {
         GST_DEBUG ("Next frame is not within reach");
         return FALSE;
@@ -1342,7 +1348,7 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
     run_loop = (input_size >= FAAD_MIN_STREAMSIZE);
   }
 
-  while ((input_size > 0) && run_loop) {
+  while ((input_size > FAAD_MIN_STREAMSIZE) && run_loop) {
 
     if (faad->packetised) {
       /* Only one packet per buffer, no matter how much is really consumed */
@@ -1353,6 +1359,53 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
       }
     }
 
+    /* sync */
+    while (input_size > FAAD_MIN_STREAMSIZE) {
+      if (looks_like_valid_header (input_data, input_size))
+        break;
+      input_data++;
+      input_size--;
+    }
+    if (input_size <= FAAD_MIN_STREAMSIZE) {
+      GST_DEBUG_OBJECT (faad, "found some garbage data.");
+      goto next;
+    }
+
+    if ((GST_READ_UINT16_BE (input_data) & 0xFFF6) == 0xFFF0) {
+      guint fr_ch;
+      static const guint32 sample_rate[] = {
+        96000, 88200, 64000, 48000, 44100, 32000,
+        24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0, 0
+      };
+#if FAAD2_MINOR_VERSION >= 7
+      unsigned long rate;
+#else
+      guint32 rate;
+#endif
+      guint8 ch;
+      /* guint profile; */
+
+      fr_ch = (input_data[2] & 0x01) << 2 | (input_data[3] >> 6);
+      rate = sample_rate[(input_data[2] & 0x3C) >> 2];
+      /* profile = (input_data[2] & 0xC0) >> 6; */
+
+      if (faad->fr_channels != fr_ch || faad->samplerate != rate) {
+        GST_INFO_OBJECT (faad, "Changing configuration. rate=%u,channels=%u",
+            rate, fr_ch);
+        faacDecClose (faad->handle);
+        faad->init = FALSE;
+        if (!gst_faad_open_decoder (faad) ||
+            faacDecInit (faad->handle, input_data, input_size, &rate, &ch) < 0)
+          goto out;
+
+        faad->init = TRUE;
+        faad->fr_channels = fr_ch;
+        faad->samplerate = rate;
+        /* make sure we create new caps below */
+        faad->channels = 0;
+      }
+    }
+
     out = faacDecDecode (faad->handle, &info, input_data + skip_bytes,
         input_size - skip_bytes);
 
@@ -1552,6 +1605,7 @@ gst_faad_change_state (GstElement * element, GstStateChange transition)
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       faad->samplerate = -1;
       faad->channels = -1;
+      faad->fr_channels = 0;
       faad->need_channel_setup = TRUE;
       faad->init = FALSE;
       g_free (faad->channel_positions);
diff --git a/ext/faad/gstfaad.h b/ext/faad/gstfaad.h
index fd989b6..424ddf8 100644
--- a/ext/faad/gstfaad.h
+++ b/ext/faad/gstfaad.h
@@ -48,6 +48,7 @@ typedef struct _GstFaad {
 
   guint      samplerate; /* sample rate of the last MPEG frame    */
   guint      channels;   /* number of channels of the last frame  */
+  guint      fr_channels;/* number of input channels of the last frame */
   guint      bps;        /* bytes per sample                      */
 
   guint8     fake_codec_data[2];