gst/audioconvert/gstchannelmix.c: walk the samples backwards if out_channels > in_cha...

Original commit message from CVS:
* gst/audioconvert/gstchannelmix.c: (gst_audio_convert_mix):
walk the samples backwards if out_channels > in_channels so we don't
overwrite data

diff --git a/ChangeLog b/ChangeLog
index eb385bfb12e548e79d7962bdd0fab99028bca7bc..4ba02973e6aaa03c9af970a6ae01d3ba80f1d6d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-28  Benjamin Otte  <otte@gnome.org>
+
+       * gst/audioconvert/gstchannelmix.c: (gst_audio_convert_mix):
+         walk the samples backwards if out_channels > in_channels so we don't
+         overwrite data
+
 2004-11-28  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * gst/audioconvert/Makefile.am:

diff --git a/gst/audioconvert/gstchannelmix.c b/gst/audioconvert/gstchannelmix.c
index 7d51127c19999b4818c1f1d41dc08473ecf506c2..705cfad5872d43eb0f9c5bb62e10f00bef390536 100644 (file)
--- a/gst/audioconvert/gstchannelmix.c
+++ b/gst/audioconvert/gstchannelmix.c
@@ -524,16 +524,20 @@ gst_audio_convert_passthrough (GstAudioConvert * this)
   return TRUE;
 }
 
+/* IMPORTANT: out_data == in_data is possible, make sure to not overwrite data
+ * you might need later on! */
 void
 gst_audio_convert_mix (GstAudioConvert * this,
     gint32 * in_data, gint32 * out_data, gint samples)
 {
   gint in, out, n;
   gint64 res;
+  gboolean backwards = this->srccaps.channels > this->sinkcaps.channels;
 
   /* FIXME: use liboil here? */
-  for (out = 0; out < this->srccaps.channels; out++) {
-    for (n = 0; n < samples; n++) {
+  for (n = (backwards ? samples - 1 : 0); n < samples && n >= 0;
+      backwards ? n-- : n++) {
+    for (out = 0; out < this->srccaps.channels; out++) {
       /* convert */
       res = 0;
       for (in = 0; in < this->sinkcaps.channels; in++) {