gst/audioscale/gstaudioscale.c: %#^@^#@^@#^#@^#@^@#^@#^@#^@#^#@^#@^#@^@#^#@ fix seeki...

Original commit message from CVS:
* gst/audioscale/gstaudioscale.c: (gst_audioscale_init),
(gst_audioscale_chain):
%#^@^#@^@#^#@^#@^@#^@#^@#^@#^#@^#@^#@^@#^#@ fix seeking
when resampling - how the ^@$^!@^! is this possible?!?

diff --git a/ChangeLog b/ChangeLog
index b222cf4..df85f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
+       * gst/audioscale/gstaudioscale.c: (gst_audioscale_init),
+       (gst_audioscale_chain):
+         %#^@^#@^@#^#@^#@^@#^@#^@#^@#^#@^#@^#@^@#^#@ fix seeking
+         when resampling - how the ^@$^!@^! is this possible?!?
+
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
        * ext/alsa/gstalsa.c: (gst_alsa_change_state):
          Reset variables on READY.
        * gst/matroska/matroska-mux.c: (gst_matroska_mux_request_new_pad),

diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c
index b1253cb..af95ce9 100644 (file)
--- a/gst/audioscale/gstaudioscale.c
+++ b/gst/audioscale/gstaudioscale.c
@@ -523,6 +523,8 @@ gst_audioscale_init (Audioscale * audioscale)
   audioscale->offsets = NULL;
   audioscale->gst_resample_offset = 0;
   audioscale->increase = FALSE;
+
+  GST_FLAG_SET (audioscale, GST_ELEMENT_EVENT_AWARE);
 }
 
 static void
@@ -564,6 +566,45 @@ gst_audioscale_chain (GstPad * pad, GstData * _data)
     return;
   }
 
+  if (GST_IS_EVENT (_data)) {
+    GstEvent *e = GST_EVENT (_data);
+
+    switch (GST_EVENT_TYPE (e)) {
+      case GST_EVENT_DISCONTINUOUS:{
+        gint64 new_off;
+
+        if (gst_event_discont_get_value (e, GST_FORMAT_TIME, &new_off)) {
+          /* time -> out-sample */
+          new_off = new_off * audioscale->gst_resample->o_rate / GST_SECOND;
+        } else if (gst_event_discont_get_value (e,
+                GST_FORMAT_DEFAULT, &new_off)) {
+          /* in-sample -> out-sample */
+          new_off *= audioscale->gst_resample->o_rate;
+          new_off /= audioscale->gst_resample->i_rate;
+        } else if (gst_event_discont_get_value (e, GST_FORMAT_BYTES, &new_off)) {
+          new_off /= audioscale->gst_resample->channels;
+          new_off /=
+              (audioscale->gst_resample->format == GST_RESAMPLE_S16) ? 2 : 4;
+          new_off *= audioscale->gst_resample->o_rate;
+          new_off /= audioscale->gst_resample->i_rate;
+        } else {
+          /* *sigh* */
+          new_off = 0;
+        }
+        audioscale->gst_resample_offset = new_off;
+        /* fall-through */
+      }
+      default:
+        gst_pad_event_default (pad, e);
+        break;
+    }
+    return;
+  } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
+    /* update time for out-sample */
+    audioscale->gst_resample_offset = GST_BUFFER_TIMESTAMP (buf) *
+        audioscale->gst_resample->o_rate / GST_SECOND;
+  }
+
   data = GST_BUFFER_DATA (buf);
   size = GST_BUFFER_SIZE (buf);