devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Backout part of the last change to fix builds for now

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8479 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-01-29 02:46:18 +00:00
parent a8cc6a7454
commit 236d52410f
2 changed files with 0 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/SOURCES
View file

@ -76,8 +76,4 @@ playback.c
metadata.c metadata.c
codecs.c codecs.c
dsp.c dsp.c
eq.c
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
eq_cf.S
#endif
#endif #endif

34
apps/dsp.c
View file

@ -19,7 +19,6 @@
#include <inttypes.h> #include <inttypes.h>
#include <string.h> #include <string.h>
#include "dsp.h" #include "dsp.h"
#include "eq.h"
#include "kernel.h" #include "kernel.h"
#include "playback.h" #include "playback.h"
#include "system.h" #include "system.h"
@ -167,21 +166,10 @@ struct crossfeed_data
int index; int index;
}; };
/* Current setup is one lowshelf filters, three peaking filters and one
highshelf filter. Varying the number of shelving filters make no sense,
but adding peaking filters are possible. */
struct eq_state {
char enabled[5]; /* Flags for active filters */
struct eqfilter ls;
struct eqfilter pk[3];
struct eqfilter hs;
};
static struct dsp_config dsp_conf[2] IBSS_ATTR; static struct dsp_config dsp_conf[2] IBSS_ATTR;
static struct dither_data dither_data[2] IBSS_ATTR; static struct dither_data dither_data[2] IBSS_ATTR;
static struct resample_data resample_data[2] IBSS_ATTR; static struct resample_data resample_data[2] IBSS_ATTR;
struct crossfeed_data crossfeed_data IBSS_ATTR; struct crossfeed_data crossfeed_data IBSS_ATTR;
static struct eq_state eq_data;
static int pitch_ratio = 1000; static int pitch_ratio = 1000;
@ -620,25 +608,6 @@ static void apply_crossfeed(long* src[], int count)
} }
#endif #endif
/* Apply EQ filters to those bands that have got it switched on. */
void eq_process(long **x, unsigned num)
{
int i;
unsigned int channels = dsp->stereo_mode != STEREO_MONO ? 2 : 1;
/* filter configuration currently is 1 low shelf filter, 3 band peaking
filters and 1 high shelf filter, in that order.
*/
if (eq_data.enabled[0])
eq_filter(x, &eq_data.ls, num, channels, EQ_SHELF_SHIFT);
for (i = 0; i < 3; i++) {
if (eq_data.enabled[1 + i])
eq_filter(x, &eq_data.pk[i], num, channels, EQ_PEAK_SHIFT);
}
if (eq_data.enabled[4])
eq_filter(x, &eq_data.hs, num, channels, EQ_SHELF_SHIFT);
}
/* Apply a constant gain to the samples (e.g., for ReplayGain). May update /* Apply a constant gain to the samples (e.g., for ReplayGain). May update
* the src array if gain was applied. * the src array if gain was applied.
* Note that this must be called before the resampler. * Note that this must be called before the resampler.
@ -744,9 +713,6 @@ long dsp_process(char* dst, char* src[], long size)
samples = resample(tmp, samples); samples = resample(tmp, samples);
if (dsp->crossfeed_enabled && dsp->stereo_mode != STEREO_MONO) if (dsp->crossfeed_enabled && dsp->stereo_mode != STEREO_MONO)
apply_crossfeed(tmp, samples); 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);
write_samples((short*) dst, tmp, samples); write_samples((short*) dst, tmp, samples);
written += samples; written += samples;
dst += samples * sizeof(short) * 2; dst += samples * sizeof(short) * 2;