equalizer: Don't reset frequency bands from user settings. Fixes #570343.

Move reallocating the history buffer out of _compute_frequencies() and call the
right function as needed. Add some logging and tweak the formatting of existing
logging. Simplify setting need_new_coefficients when changing properties.

diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c
index 8a87e9387e2e2d9dba601523bbd7570d33dfe61f..4d21a87424a4ee2194fdedaacd92e1a2cf138502 100644 (file)
--- a/gst/equalizer/gstiirequalizer.c
+++ b/gst/equalizer/gstiirequalizer.c
@@ -141,8 +141,7 @@ gst_iir_equalizer_band_set_property (GObject * object, guint prop_id,
         GstIirEqualizer *equ =
             GST_IIR_EQUALIZER (gst_object_get_parent (GST_OBJECT (band)));
 
-        equ->need_new_coefficients = equ->need_new_coefficients ||
-            (band->gain != gain);
+        equ->need_new_coefficients = TRUE;
         band->gain = gain;
 
         gst_object_unref (equ);
@@ -159,8 +158,7 @@ gst_iir_equalizer_band_set_property (GObject * object, guint prop_id,
         GstIirEqualizer *equ =
             GST_IIR_EQUALIZER (gst_object_get_parent (GST_OBJECT (band)));
 
-        equ->need_new_coefficients = equ->need_new_coefficients ||
-            (band->freq != freq);
+        equ->need_new_coefficients = TRUE;
         band->freq = freq;
         gst_object_unref (equ);
         GST_DEBUG_OBJECT (band, "changed freq = %lf ", band->freq);
@@ -176,8 +174,7 @@ gst_iir_equalizer_band_set_property (GObject * object, guint prop_id,
         GstIirEqualizer *equ =
             GST_IIR_EQUALIZER (gst_object_get_parent (GST_OBJECT (band)));
 
-        equ->need_new_coefficients = equ->need_new_coefficients ||
-            (band->width != width);
+        equ->need_new_coefficients = TRUE;
         band->width = width;
         gst_object_unref (equ);
         GST_DEBUG_OBJECT (band, "changed width = %lf ", band->width);
@@ -390,12 +387,9 @@ setup_filter (GstIirEqualizer * equ, GstIirEqualizerBand * band)
    */
   {
     gdouble gain, omega, bw;
-
     gdouble edge_gain, gamma;
-
     gdouble alpha, beta;
 
-
     gain = arg_to_scale (band->gain);
 
     if (band->freq / GST_AUDIO_FILTER (equ)->format.rate > 0.5)
@@ -441,7 +435,7 @@ setup_filter (GstIirEqualizer * equ, GstIirEqualizerBand * band)
 
   out:
     GST_INFO
-        ("gain = %7.5g, , bandwidth= %7.5g, frequency = %7.5g, a0 = %7.5g, a1 = %7.5g, a2=%7.5g b1 = %7.5g, b2 = %7.5g",
+        ("gain = %5.1f, width= %7.2f, freq = %7.2f, a0 = %7.5g, a1 = %7.5g, a2=%7.5g b1 = %7.5g, b2 = %7.5g",
         band->gain, band->width, band->freq, band->a0, band->a1, band->a2,
         band->b1, band->b2);
   }
@@ -473,15 +467,26 @@ update_coefficients (GstIirEqualizer * equ)
   equ->need_new_coefficients = FALSE;
 }
 
+static void
+alloc_history (GstIirEqualizer * equ)
+{
+  /* free + alloc = no memcpy */
+  g_free (equ->history);
+  equ->history =
+      g_malloc0 (equ->history_size * GST_AUDIO_FILTER (equ)->format.channels *
+      equ->freq_band_count);
+}
+
 void
 gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
 {
   guint old_count, i;
-
   gdouble freq0, freq1, step;
-
   gchar name[20];
 
+  if (equ->freq_band_count == new_count)
+    return;
+
   old_count = equ->freq_band_count;
   equ->freq_band_count = new_count;
   GST_DEBUG ("bands %u -> %u", old_count, new_count);
@@ -494,6 +499,7 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
       /* otherwise they get names like 'iirequalizerband5' */
       sprintf (name, "band%u", i);
       gst_object_set_name (GST_OBJECT (equ->bands[i]), name);
+      GST_DEBUG ("adding band[%d]=%p", i, equ->bands[i]);
 
       gst_object_set_parent (GST_OBJECT (equ->bands[i]), GST_OBJECT (equ));
       gst_child_proxy_child_added (GST_OBJECT (equ),
@@ -510,11 +516,7 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
     }
   }
 
-  /* free + alloc = no memcpy */
-  g_free (equ->history);
-  equ->history =
-      g_malloc0 (equ->history_size * GST_AUDIO_FILTER (equ)->format.channels *
-      new_count);
+  alloc_history (equ);
 
   /* set center frequencies and name band objects
    * FIXME: arg! we can't change the name of parented objects :(
@@ -716,7 +718,7 @@ gst_iir_equalizer_setup (GstAudioFilter * audio, GstRingBufferSpec * fmt)
       return FALSE;
   }
 
-  gst_iir_equalizer_compute_frequencies (equ, equ->freq_band_count);
+  alloc_history (equ);
   return TRUE;
 }