summaryrefslogtreecommitdiff
path: root/lib/rbcodec/test/warble.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-05-23 13:58:51 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-07-06 04:22:04 +0200
commitd37bf24d9011addbfbd40942a4e9bbf26de7df00 (patch)
treedafb7eaeb494081668a4841d490fce2bfbb2438d /lib/rbcodec/test/warble.c
parent00faabef5e902008172e08d3bcd77683cbafef51 (diff)
downloadrockbox-d37bf24d9011addbfbd40942a4e9bbf26de7df00.tar.gz
rockbox-d37bf24d9011addbfbd40942a4e9bbf26de7df00.zip
Enable setting of global output samplerate on certain targets.
Replaces the NATIVE_FREQUENCY constant with a configurable frequency. The user may select 48000Hz if the hardware supports it. The default is still 44100Hz and the minimum is 44100Hz. The setting is located in the playback settings, under "Frequency". "Frequency" was duplicated in english.lang for now to avoid having to fix every .lang file for the moment and throwing everything out of sync because of the new play_frequency feature in features.txt. The next cleanup should combine it with the one included for recording and generalize the ID label. If the hardware doesn't support 48000Hz, no setting will be available. On particular hardware where very high rates are practical and desireable, the upper bound can be extended by patching. The PCM mixer can be configured to play at the full hardware frequency range. The DSP core can configure to the hardware minimum up to the maximum playback setting (some buffers must be reserved according to the maximum rate). If only 44100Hz is supported or possible on a given target for playback, using the DSP and mixer at other samperates is possible if the hardware offers them. Change-Id: I6023cf0c0baa8bc6292b6919b4dd3618a6a25622 Reviewed-on: http://gerrit.rockbox.org/479 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'lib/rbcodec/test/warble.c')
-rw-r--r--lib/rbcodec/test/warble.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c
index 735fa2511f..336438374c 100644
--- a/lib/rbcodec/test/warble.c
+++ b/lib/rbcodec/test/warble.c
@@ -145,7 +145,7 @@ static void write_wav_header(void)
145 if (use_dsp) { 145 if (use_dsp) {
146 channels = 2; 146 channels = 2;
147 sample_size = 16; 147 sample_size = 16;
148 freq = NATIVE_FREQUENCY; 148 freq = dsp_get_output_frequency(ci.dsp);
149 type = WAVE_FORMAT_PCM; 149 type = WAVE_FORMAT_PCM;
150 } else { 150 } else {
151 channels = format.channels; 151 channels = format.channels;
@@ -312,7 +312,7 @@ static void playback_start(void)
312{ 312{
313 playback_running = true; 313 playback_running = true;
314 SDL_AudioSpec spec = {0}; 314 SDL_AudioSpec spec = {0};
315 spec.freq = NATIVE_FREQUENCY; 315 spec.freq = dsp_get_output_frequency(ci.dsp);
316 spec.format = AUDIO_S16SYS; 316 spec.format = AUDIO_S16SYS;
317 spec.channels = 2; 317 spec.channels = 2;
318 spec.samples = 0x400; 318 spec.samples = 0x400;
@@ -776,6 +776,7 @@ static void decode_file(const char *input_fn)
776 ci.id3 = &id3; 776 ci.id3 = &id3;
777 if (use_dsp) { 777 if (use_dsp) {
778 ci.dsp = dsp_get_config(CODEC_IDX_AUDIO); 778 ci.dsp = dsp_get_config(CODEC_IDX_AUDIO);
779 dsp_configure(ci.dsp, DSP_SET_OUT_FREQUENCY, DSP_OUT_DEFAULT_HZ);
779 dsp_configure(ci.dsp, DSP_RESET, 0); 780 dsp_configure(ci.dsp, DSP_RESET, 0);
780 dsp_dither_enable(false); 781 dsp_dither_enable(false);
781 } 782 }