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

Add software based bass/treble controls for targets which have no such functionality in hardware (currently only X5). They can also be used on any other SWCODEC target by adding #define HAVE_SW_TONE_CONTROLS in the relevant config-*.h file. Also remove some now unneeded zero checks when using get_replaygain_int(). Comments on sound quality are welcome as some parameters can still be fine-tuned.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12489 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2007-02-26 00:41:26 +00:00
parent 1915c10994
commit a7fabf0741
9 changed files with 175 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

53
firmware/sound.c
View file

@ -86,6 +86,11 @@ static const struct sound_settings_info sound_settings_table[] = {
[SOUND_VOLUME] = {"dB", 0, 1, -78, 18, -18, sound_set_volume},
[SOUND_BASS] = {"dB", 0, 1, -15, 15, 7, sound_set_bass},
[SOUND_TREBLE] = {"dB", 0, 1, -15, 15, 7, sound_set_treble},
#endif
/* Override any other potentially existing treble/bass controllers if wanted */
#ifdef HAVE_SW_TONE_CONTROLS
[SOUND_BASS] = {"dB", 0, 1, -24, 24, 0, sound_set_bass},
[SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0, sound_set_treble},
#endif
[SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0, sound_set_balance},
[SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0, sound_set_channels},
@ -166,6 +171,22 @@ sound_set_type* sound_get_fn(int setting)
return NULL;
}
#ifdef HAVE_SW_TONE_CONTROLS
/* Copied from dsp.h, nasty nasty, but we don't want to include dsp.h */
enum {
DSP_CALLBACK_SET_PRESCALE = 0,
DSP_CALLBACK_SET_BASS,
DSP_CALLBACK_SET_TREBLE
};
static int (*dsp_callback)(int, intptr_t) = NULL;
void sound_set_dsp_callback(int (*func)(int, intptr_t))
{
dsp_callback = func;
}
#endif
#ifndef SIMULATOR
#if CONFIG_CODEC == MAS3507D /* volume/balance/treble/bass interdependency */
#define VOLUME_MIN -780
@ -293,10 +314,9 @@ int current_bass = 0; /* -150..+150 0..+240 */
static void set_prescaled_volume(void)
{
int prescale = 0;
int prescale;
int l, r;
#ifndef HAVE_TLV320
prescale = MAX(current_bass, current_treble);
if (prescale < 0)
prescale = 0; /* no need to prescale if we don't boost
@ -307,13 +327,12 @@ static void set_prescaled_volume(void)
* instead (might cause clipping). */
if (current_volume + prescale > VOLUME_MAX)
prescale = VOLUME_MAX - current_volume;
#endif
#if CONFIG_CODEC == MAS3507D
#if defined(HAVE_SW_TONE_CONTROLS)
dsp_callback(DSP_CALLBACK_SET_PRESCALE, prescale);
#elif CONFIG_CODEC == MAS3507D
mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]);
#elif defined(HAVE_UDA1380)
audiohw_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
#elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
audiohw_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
#endif
@ -338,9 +357,7 @@ static void set_prescaled_volume(void)
#if CONFIG_CODEC == MAS3507D
dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
#elif defined(HAVE_UDA1380)
audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r));
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
#elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r));
#if defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8751)
@ -484,12 +501,15 @@ void sound_set_balance(int value)
#endif
}
#ifndef HAVE_TLV320
void sound_set_bass(int value)
{
if(!audio_is_initialized)
return;
#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
#if defined(HAVE_SW_TONE_CONTROLS)
current_bass = value * 10;
dsp_callback(DSP_CALLBACK_SET_BASS, current_bass);
set_prescaled_volume();
#elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
unsigned tmp = ((unsigned)(value * 8) & 0xff) << 8;
mas_codec_writereg(0x14, tmp);
#elif CONFIG_CODEC == MAS3507D
@ -515,7 +535,11 @@ void sound_set_treble(int value)
{
if(!audio_is_initialized)
return;
#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
#if defined(HAVE_SW_TONE_CONTROLS)
current_treble = value * 10;
dsp_callback(DSP_CALLBACK_SET_TREBLE, current_treble);
set_prescaled_volume();
#elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
unsigned tmp = ((unsigned)(value * 8) & 0xff) << 8;
mas_codec_writereg(0x15, tmp);
#elif CONFIG_CODEC == MAS3507D
@ -536,7 +560,6 @@ void sound_set_treble(int value)
(void)value;
#endif
}
#endif /* HAVE_TLV320 */
void sound_set_channels(int value)
{