ext/faac/gstfaac.*: Change timestamp generation to lineair since that works at least somewhat (although, arguably, it...

Original commit message from CVS:
* ext/faac/gstfaac.c: (gst_faac_init), (gst_faac_srcconnect),
(gst_faac_chain), (gst_faac_change_state):
* ext/faac/gstfaac.h:
Change timestamp generation to lineair since that works at least
somewhat (although, arguably, it is incorrect). Disable all but
16-bit integer input since all the other are untested and lead
to unpredicteable results inside libfaac.

3 files changed, 52 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index f96e9432..3ab9ee84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-14  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/faac/gstfaac.c: (gst_faac_init), (gst_faac_srcconnect),
+	(gst_faac_chain), (gst_faac_change_state):
+	* ext/faac/gstfaac.h:
+	  Change timestamp generation to lineair since that works at least
+	  somewhat (although, arguably, it is incorrect). Disable all but
+	  16-bit integer input since all the other are untested and lead
+	  to unpredicteable results inside libfaac.
+
 2005-03-14  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/nas/nassink.c: (gst_nassink_init), (gst_nassink_sync_parms),
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index c5148773..58b93716 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstfaac.h"
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
@@ -34,10 +36,28 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, " "endianness = (int) BYTE_ORDER, " "signed = (boolean) TRUE, " "width = (int) 16, " "depth = (int) 16, " "rate = (int) [ 8000, 96000 ], " "channels = (int) [ 1, 6]; " "audio/x-raw-int, " "endianness = (int) BYTE_ORDER, " "signed = (boolean) TRUE, " "width = (int) 32, " "depth = (int) 24, " "rate = (int) [ 8000, 96000], " "channels = (int) [ 1, 6]; " "audio/x-raw-float, " "endianness = (int) BYTE_ORDER, " "depth = (int) 32, "    /* sizeof (gfloat) */
-        "rate = (int) [ 8000, 96000], " "channels = (int) [ 1, 6]")
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) TRUE, "
+        "width = (int) 16, "
+        "depth = (int) 16, "
+        "rate = (int) [ 8000, 96000 ], " "channels = (int) [ 1, 6]")
     );
 
+#define UNUSED \
+    "audio/x-raw-int, " \
+    "endianness = (int) BYTE_ORDER, " \
+    "signed = (boolean) TRUE, " \
+    "width = (int) 32, " \
+    "depth = (int) 24, " \
+    "rate = (int) [ 8000, 96000], " \
+    "channels = (int) [ 1, 6]; " \
+    "audio/x-raw-float, " \
+    "endianness = (int) BYTE_ORDER, " \
+    "depth = (int) 32, "    /* sizeof (gfloat) */ \
+    "rate = (int) [ 8000, 96000], " \
+    "channels = (int) [ 1, 6]" \
+
 enum
 {
   ARG_0,
@@ -221,8 +241,7 @@ gst_faac_init (GstFaac * faac)
   faac->samplerate = -1;
   faac->channels = -1;
   faac->cache = NULL;
-  faac->cache_time = GST_CLOCK_TIME_NONE;
-  faac->cache_duration = 0;
+  faac->out_time = 0;
 
   GST_FLAG_SET (faac, GST_ELEMENT_EVENT_AWARE);
 
@@ -340,6 +359,8 @@ gst_faac_srcconnect (GstPad * pad, const GstCaps * caps)
     gint mpegversion = 0;
     GstCaps *newcaps;
     GstPadLinkReturn ret;
+    guint8 *c_data;
+    gulong c_size;
 
     gst_structure_get_int (structure, "mpegversion", &mpegversion);
 
@@ -363,6 +384,13 @@ gst_faac_srcconnect (GstPad * pad, const GstCaps * caps)
         "mpegversion", G_TYPE_INT, mpegversion,
         "channels", G_TYPE_INT, faac->channels,
         "rate", G_TYPE_INT, faac->samplerate, NULL);
+    if (faacEncGetDecoderSpecificInfo (faac->handle, &c_data, &c_size) == 0) {
+      GstBuffer *data = gst_buffer_new_and_alloc (c_size);
+
+      memcpy (GST_BUFFER_DATA (data), c_data, c_size);
+      gst_caps_set_simple (newcaps, "codec_data", GST_TYPE_BUFFER, data, NULL);
+      gst_buffer_unref (data);
+    }
     ret = gst_pad_try_set_caps (faac->srcpad, newcaps);
 
     switch (ret) {
@@ -404,8 +432,10 @@ gst_faac_chain (GstPad * pad, GstData * data)
 
           if (ret_size > 0) {
             GST_BUFFER_SIZE (outbuf) = ret_size;
-            GST_BUFFER_TIMESTAMP (outbuf) = 0;
-            GST_BUFFER_DURATION (outbuf) = 0;
+            GST_BUFFER_TIMESTAMP (outbuf) = faac->out_time;
+            GST_BUFFER_DURATION (outbuf) = GST_SECOND * faac->samples /
+                (faac->channels * faac->samplerate);
+            faac->out_time += GST_BUFFER_DURATION (outbuf);
             gst_pad_push (faac->srcpad, GST_DATA (outbuf));
           } else {
             break;
@@ -511,30 +541,11 @@ gst_faac_chain (GstPad * pad, GstData * data)
 
     if (ret_size > 0) {
       GST_BUFFER_SIZE (outbuf) = ret_size;
-      if (faac->cache_time != GST_CLOCK_TIME_NONE) {
-        GST_BUFFER_TIMESTAMP (outbuf) = faac->cache_time;
-        faac->cache_time = GST_CLOCK_TIME_NONE;
-      } else
-        GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (subbuf);
-      GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (subbuf);
-      if (faac->cache_duration) {
-        GST_BUFFER_DURATION (outbuf) += faac->cache_duration;
-        faac->cache_duration = 0;
-      }
+      GST_BUFFER_TIMESTAMP (outbuf) = faac->out_time;
+      GST_BUFFER_DURATION (outbuf) = GST_SECOND * faac->samples /
+          (faac->channels * faac->samplerate);
+      faac->out_time += GST_BUFFER_DURATION (outbuf);
       gst_pad_push (faac->srcpad, GST_DATA (outbuf));
-    } else {
-      /* FIXME: what I'm doing here isn't fully correct, but there
-       * really isn't a better way yet.
-       * Problem is that libfaac caches buffers (for encoding
-       * purposes), so the timestamp of the outgoing buffer isn't
-       * the same as the timestamp of the data that I pushed in.
-       * However, I don't know the delay between those two so I
-       * cannot really say aything about it. This is a bad guess. */
-
-      gst_buffer_unref (outbuf);
-      if (faac->cache_time != GST_CLOCK_TIME_NONE)
-        faac->cache_time = GST_BUFFER_TIMESTAMP (subbuf);
-      faac->cache_duration += GST_BUFFER_DURATION (subbuf);
     }
 
     in_size -= frame_size;
@@ -619,8 +630,7 @@ gst_faac_change_state (GstElement * element)
         gst_buffer_unref (faac->cache);
         faac->cache = NULL;
       }
-      faac->cache_time = GST_CLOCK_TIME_NONE;
-      faac->cache_duration = 0;
+      faac->out_time = 0;
       faac->samplerate = -1;
       faac->channels = -1;
       break;
diff --git a/ext/faac/gstfaac.h b/ext/faac/gstfaac.h
index b45f849e..17f3f9e2 100644
--- a/ext/faac/gstfaac.h
+++ b/ext/faac/gstfaac.h
@@ -61,7 +61,7 @@ typedef struct _GstFaac {
 
   /* cache of the input */
   GstBuffer *cache;
-  guint64 cache_time, cache_duration;
+  guint64 out_time;
 } GstFaac;
 
 typedef struct _GstFaacClass {