diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-05 04:36:05 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-11 22:55:16 +0200 |
| commit | f5a5b946867677de76c405ee72e2ea47e36e4c83 (patch) | |
| tree | 8fb97a35059a16681b726973b4a5e13d41f96a35 /lib | |
| parent | a9049a79d706dba61837ad02c7d7e3475cb6c193 (diff) | |
| download | rockbox-f5a5b946867677de76c405ee72e2ea47e36e4c83.zip rockbox-f5a5b946867677de76c405ee72e2ea47e36e4c83.tar.gz rockbox-f5a5b946867677de76c405ee72e2ea47e36e4c83.tar.bz2 rockbox-f5a5b946867677de76c405ee72e2ea47e36e4c83.tar.xz | |
Implement universal in-PCM-driver software volume control.
Implements double-buffered volume, balance and prescaling control in
the main PCM driver when HAVE_SW_VOLUME_CONTROL is defined ensuring
that all PCM is volume controlled and level changes are low in latency.
Supports -73 to +6 dB using a 15-bit factor so that no large-integer
math is needed.
Low-level hardware drivers do not have to implement it themselves but
parameters can be changed (currently defined in pcm-internal.h) to work
best with a particular SoC or to provide different volume ranges.
Volume and prescale calls should be made in the codec driver. It should
appear as a normal hardware interface. PCM volume calls expect .1 dB
units.
Change-Id: Idf6316a64ef4fb8abcede10707e1e6c6d01d57db
Reviewed-on: http://gerrit.rockbox.org/423
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rbcodec/dsp/dsp_misc.c | 18 | ||||
| -rw-r--r-- | lib/rbcodec/dsp/pga.h | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c index 1083215..a8c9423 100644 --- a/lib/rbcodec/dsp/dsp_misc.c +++ b/lib/rbcodec/dsp/dsp_misc.c @@ -35,11 +35,6 @@ #endif #include <string.h> -#if defined(HAVE_SW_TONE_CONTROLS) && defined(HAVE_SW_VOLUME_CONTROL) -/* Still need this for volume control */ -#include "settings.h" -#endif - /** Firmware callback interface **/ /* Hook back from firmware/ part of audio, which can't/shouldn't call apps/ @@ -58,19 +53,6 @@ int dsp_callback(int msg, intptr_t param) case DSP_CALLBACK_SET_TREBLE: tone_set_treble(param); break; - /* FIXME: This must be done by bottom-level PCM driver so it works with - all PCM, not here and not in mixer. I won't fully support it - here with all streams. -- jethead71 */ -#ifdef HAVE_SW_VOLUME_CONTROL - case DSP_CALLBACK_SET_SW_VOLUME: - if (global_settings.volume < SW_VOLUME_MAX || - global_settings.volume > SW_VOLUME_MIN) - { - int vol_gain = get_replaygain_int(global_settings.volume * 100); - pga_set_gain(PGA_VOLUME, vol_gain); - } - break; -#endif /* HAVE_SW_VOLUME_CONTROL */ #endif /* HAVE_SW_TONE_CONTROLS */ case DSP_CALLBACK_SET_CHANNEL_CONFIG: channel_mode_set_config(param); diff --git a/lib/rbcodec/dsp/pga.h b/lib/rbcodec/dsp/pga.h index f0c4c47..c052658 100644 --- a/lib/rbcodec/dsp/pga.h +++ b/lib/rbcodec/dsp/pga.h @@ -28,9 +28,6 @@ enum pga_gain_ids { PGA_EQ_PRECUT = 0, PGA_REPLAYGAIN, -#ifdef HAVE_SW_VOLUME_CONTROL - PGA_VOLUME, -#endif PGA_NUM_GAINS, }; |