Add Equalizer configuration to Sound Settings menu.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8606 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 58 insertions, 3 deletions

diff --git a/apps/dsp.c b/apps/dsp.c
index 789cf72b20..e4d28bd083 100644
--- a/apps/dsp.c
+++ b/apps/dsp.c
@@ -145,6 +145,7 @@ struct dsp_config
     bool dither_enabled;
     bool new_gain;
     bool crossfeed_enabled;
+    bool eq_enabled;
 };
 
 struct resample_data
@@ -618,6 +619,61 @@ static void apply_crossfeed(long* src[], int count)
 }
 #endif
 
+#define EQ_CUTOFF_USER2REAL(x) (0xffffffff / NATIVE_FREQUENCY * (x))
+#define EQ_Q_USER2REAL(x) (((x) << 16) / 10)
+#define EQ_GAIN_USER2REAL(x) (((x) << 16) / 10)
+
+/* Synchronize the EQ filters with the global settings */
+void dsp_eq_update_data(bool enabled)
+{
+    int i;
+    int *setting;
+    int gain, cutoff, q, maxgain;
+    
+    dsp->eq_enabled = enabled;
+    setting = &global_settings.eq_band0_cutoff;
+    maxgain = 0;
+    
+    #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+    /* set emac unit for dsp processing, and save old macsr, we're running in
+       codec thread context at this point, so can't clobber it */
+    unsigned long old_macsr = coldfire_get_macsr();
+    coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE);
+    #endif
+    
+    /* Iterate over each band and update the appropriate filter */
+    for(i = 0; i < 5; i++) {
+        cutoff = *setting++;
+        q = *setting++;
+        gain = *setting++;
+
+        /* Keep track of maxgain for the pre-amp */
+        if (gain > maxgain)
+            maxgain = gain;
+
+        if (gain == 0) {
+            eq_data.enabled[i] = 0;
+        } else {
+            if (i == 0)
+                eq_ls_coefs(EQ_CUTOFF_USER2REAL(cutoff), EQ_Q_USER2REAL(q),
+                    EQ_GAIN_USER2REAL(gain), eq_data.filters[0].coefs);
+            else if (i == 4)
+                eq_hs_coefs(EQ_CUTOFF_USER2REAL(cutoff), EQ_Q_USER2REAL(q),
+                    EQ_GAIN_USER2REAL(gain), eq_data.filters[4].coefs);
+            else
+                eq_pk_coefs(EQ_CUTOFF_USER2REAL(cutoff), EQ_Q_USER2REAL(q),
+                    EQ_GAIN_USER2REAL(gain), eq_data.filters[i].coefs);
+
+            eq_data.enabled[i] = 1;
+        }
+    }
+
+    #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+    /* set old macsr again */
+    coldfire_set_macsr(old_macsr);
+    #endif
+}
+
 /* Apply EQ filters to those bands that have got it switched on. */
 static void eq_process(long **x, unsigned num)
 {
@@ -745,9 +801,8 @@ long dsp_process(char* dst, char* src[], long size)
         samples = resample(tmp, samples);
         if (dsp->crossfeed_enabled && dsp->stereo_mode != STEREO_MONO)
             apply_crossfeed(tmp, samples);
-        /* TODO: Might want to wrap this with a generic eq_enabled when the
-           settings are in place */
-        eq_process(tmp, samples);
+        if (dsp->eq_enabled)
+            eq_process(tmp, samples);
         write_samples((short*) dst, tmp, samples);
         written += samples;
         dst += samples * sizeof(short) * 2;