len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Purge the usage of DSP_SWITCH_FREQUENCY.

Browse source 
DSP_SWITCH_FREQUENCY has been deprecated and the same enumerated value
as DSP_SET_FREQUENCY since major DSP revisions were committed. This
task should have been performed much earlier but, oh well, do it now.

Change-Id: I3f30d651b894136a07c7e17f78fc16a7d98631ff
This commit is contained in:
Michael Sevakis 2013-05-05 00:48:40 -04:00
parent fd00d3cf48
commit 3fd25dcbed
27 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/mpegplayer/audio_thread.c
View file

@ -621,7 +621,7 @@ static void audio_thread(void)
if (frame.header.samplerate != td.samplerate) if (frame.header.samplerate != td.samplerate)
{ {
td.samplerate = frame.header.samplerate; td.samplerate = frame.header.samplerate;
rb->dsp_configure(td.dsp, DSP_SWITCH_FREQUENCY, rb->dsp_configure(td.dsp, DSP_SET_FREQUENCY,
td.samplerate); td.samplerate);
} }

2
lib/rbcodec/codecs/a52.c
View file

@ -142,7 +142,7 @@ enum codec_status codec_run(void)
if (codec_init()) if (codec_init())
return CODEC_ERROR; return CODEC_ERROR;
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
/* Intialise the A52 decoder and check for success */ /* Intialise the A52 decoder and check for success */

2
lib/rbcodec/codecs/a52_rm.c
View file

@ -157,7 +157,7 @@ enum codec_status codec_run(void)
resume_offset = ci->id3->offset; resume_offset = ci->id3->offset;
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
ci->seek_buffer(ci->id3->first_frame_offset); ci->seek_buffer(ci->id3->first_frame_offset);

2
lib/rbcodec/codecs/aac.c
View file

@ -84,7 +84,7 @@ enum codec_status codec_run(void)
file_offset = ci->id3->offset; file_offset = ci->id3->offset;
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
stream_create(&input_stream,ci); stream_create(&input_stream,ci);

2
lib/rbcodec/codecs/adx.c
View file

@ -218,7 +218,7 @@ enum codec_status codec_run(void)
ci->set_elapsed(0); ci->set_elapsed(0);
/* setup pcm buffer format */ /* setup pcm buffer format */
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (channels == 2) { if (channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
} else if (channels == 1) { } else if (channels == 1) {

2
lib/rbcodec/codecs/aiff.c
View file

@ -234,7 +234,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (format.channels == 2) { if (format.channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);

2
lib/rbcodec/codecs/alac.c
View file

@ -64,7 +64,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
ci->seek_buffer(0); ci->seek_buffer(0);

2
lib/rbcodec/codecs/ape.c
View file

@ -200,7 +200,7 @@ enum codec_status codec_run(void)
(ape_ctx.seektablefilepos + (ape_ctx.seektablefilepos +
ape_ctx.numseekpoints * sizeof(uint32_t))); ape_ctx.numseekpoints * sizeof(uint32_t)));
ci->configure(DSP_SWITCH_FREQUENCY, ape_ctx.samplerate); ci->configure(DSP_SET_FREQUENCY, ape_ctx.samplerate);
ci->configure(DSP_SET_STEREO_MODE, ape_ctx.channels == 1 ? ci->configure(DSP_SET_STEREO_MODE, ape_ctx.channels == 1 ?
STEREO_MONO : STEREO_NONINTERLEAVED); STEREO_MONO : STEREO_NONINTERLEAVED);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);

2
lib/rbcodec/codecs/au.c
View file

@ -225,7 +225,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (format.channels == 2) { if (format.channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
} else if (format.channels == 1) { } else if (format.channels == 1) {

2
lib/rbcodec/codecs/flac.c
View file

@ -476,7 +476,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
ci->configure(DSP_SET_STEREO_MODE, fc.channels == 1 ? ci->configure(DSP_SET_STEREO_MODE, fc.channels == 1 ?
STEREO_MONO : STEREO_NONINTERLEAVED); STEREO_MONO : STEREO_NONINTERLEAVED);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);

4
lib/rbcodec/codecs/mpa.c
View file

@ -342,7 +342,7 @@ enum codec_status codec_run(void)
file_end = 0; file_end = 0;
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
current_frequency = ci->id3->frequency; current_frequency = ci->id3->frequency;
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
@ -475,7 +475,7 @@ enum codec_status codec_run(void)
/* Check if sample rate and stereo settings changed in this frame. */ /* Check if sample rate and stereo settings changed in this frame. */
if (frame.header.samplerate != current_frequency) { if (frame.header.samplerate != current_frequency) {
current_frequency = frame.header.samplerate; current_frequency = frame.header.samplerate;
ci->configure(DSP_SWITCH_FREQUENCY, current_frequency); ci->configure(DSP_SET_FREQUENCY, current_frequency);
} }
if (MAD_NCHANNELS(&frame.header) == 2) { if (MAD_NCHANNELS(&frame.header) == 2) {
if (current_stereo_mode != STEREO_NONINTERLEAVED) { if (current_stereo_mode != STEREO_NONINTERLEAVED) {

2
lib/rbcodec/codecs/mpc.c
View file

@ -102,7 +102,7 @@ enum codec_status codec_run(void)
byterate = (mpc_uint32_t)(info.average_bitrate) / 8; byterate = (mpc_uint32_t)(info.average_bitrate) / 8;
frequency = info.sample_freq / 100; /* 0.1 kHz accuracy */ frequency = info.sample_freq / 100; /* 0.1 kHz accuracy */
ci->configure(DSP_SWITCH_FREQUENCY, info.sample_freq); ci->configure(DSP_SET_FREQUENCY, info.sample_freq);
/* Remark: rockbox offset is the file offset in bytes. So, estimate the /* Remark: rockbox offset is the file offset in bytes. So, estimate the
* sample seek position from the file offset, the sampling frequency and * sample seek position from the file offset, the sampling frequency and

2
lib/rbcodec/codecs/raac.c
View file

@ -79,7 +79,7 @@ enum codec_status codec_run(void)
ci->seek_buffer(0); ci->seek_buffer(0);
init_rm(&rmctx); init_rm(&rmctx);
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
/* initialise the sound converter */ /* initialise the sound converter */

2
lib/rbcodec/codecs/shorten.c
View file

@ -82,7 +82,7 @@ enum codec_status codec_run(void)
} }
ci->id3->frequency = sc.sample_rate; ci->id3->frequency = sc.sample_rate;
ci->configure(DSP_SWITCH_FREQUENCY, sc.sample_rate); ci->configure(DSP_SET_FREQUENCY, sc.sample_rate);
if (sc.sample_rate) { if (sc.sample_rate) {
ci->id3->length = (sc.totalsamples / sc.sample_rate) * 1000; ci->id3->length = (sc.totalsamples / sc.sample_rate) * 1000;

2
lib/rbcodec/codecs/sid.c
View file

@ -1235,7 +1235,7 @@ enum codec_status codec_main(enum codec_entry_call_reason reason)
{ {
if (reason == CODEC_LOAD) { if (reason == CODEC_LOAD) {
/* Make use of 44.1khz */ /* Make use of 44.1khz */
ci->configure(DSP_SWITCH_FREQUENCY, SAMPLE_RATE); ci->configure(DSP_SET_FREQUENCY, SAMPLE_RATE);
/* Sample depth is 28 bit host endian */ /* Sample depth is 28 bit host endian */
ci->configure(DSP_SET_SAMPLE_DEPTH, 28); ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
/* Mono output */ /* Mono output */

2
lib/rbcodec/codecs/smaf.c
View file

@ -394,7 +394,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (format.channels == 2) { if (format.channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);

2
lib/rbcodec/codecs/tta.c
View file

@ -67,7 +67,7 @@ enum codec_status codec_run(void)
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (info.NCH == 2) { if (info.NCH == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
} else if (info.NCH == 1) { } else if (info.NCH == 1) {

2
lib/rbcodec/codecs/vorbis.c
View file

@ -91,7 +91,7 @@ static bool vorbis_set_codec_parameters(OggVorbis_File *vf)
return false; return false;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
if (vi->channels == 2) { if (vi->channels == 2) {

2
lib/rbcodec/codecs/vox.c
View file

@ -119,7 +119,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO); ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO);
/* make sure we're at the correct offset */ /* make sure we're at the correct offset */

2
lib/rbcodec/codecs/wav.c
View file

@ -350,7 +350,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (format.channels == 2) { if (format.channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
} else if (format.channels == 1) { } else if (format.channels == 1) {

2
lib/rbcodec/codecs/wav64.c
View file

@ -352,7 +352,7 @@ enum codec_status codec_run(void)
return CODEC_ERROR; return CODEC_ERROR;
} }
ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
if (format.channels == 2) { if (format.channels == 2) {
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
} else if (format.channels == 1) { } else if (format.channels == 1) {

2
lib/rbcodec/codecs/wavpack.c
View file

@ -68,7 +68,7 @@ enum codec_status codec_run(void)
if (!wpc) if (!wpc)
return CODEC_ERROR; return CODEC_ERROR;
ci->configure(DSP_SWITCH_FREQUENCY, WavpackGetSampleRate (wpc)); ci->configure(DSP_SET_FREQUENCY, WavpackGetSampleRate (wpc));
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
/* bps = WavpackGetBytesPerSample (wpc); */ /* bps = WavpackGetBytesPerSample (wpc); */
nchans = WavpackGetReducedChannels (wpc); nchans = WavpackGetReducedChannels (wpc);

2
lib/rbcodec/codecs/wma.c
View file

@ -96,7 +96,7 @@ restart_track:
ci->set_elapsed(elapsedtime); ci->set_elapsed(elapsedtime);
resume_offset = 0; resume_offset = 0;
ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); ci->configure(DSP_SET_FREQUENCY, wfx.rate);
ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ?
STEREO_MONO : STEREO_NONINTERLEAVED); STEREO_MONO : STEREO_NONINTERLEAVED);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);

2
lib/rbcodec/codecs/wmapro.c
View file

@ -65,7 +65,7 @@ restart_track:
saves us from parsing it again here. */ saves us from parsing it again here. */
memcpy(&wfx, ci->id3->toc, sizeof(wfx)); memcpy(&wfx, ci->id3->toc, sizeof(wfx));
ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); ci->configure(DSP_SET_FREQUENCY, wfx.rate);
ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ?
STEREO_MONO : STEREO_NONINTERLEAVED); STEREO_MONO : STEREO_NONINTERLEAVED);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);

2
lib/rbcodec/codecs/wmavoice.c
View file

@ -90,7 +90,7 @@ restart_track:
memset(&avctx, 0, sizeof(AVCodecContext)); memset(&avctx, 0, sizeof(AVCodecContext));
memset(&avpkt, 0, sizeof(AVPacket)); memset(&avpkt, 0, sizeof(AVPacket));
ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); ci->configure(DSP_SET_FREQUENCY, wfx.rate);
ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ?
STEREO_MONO : STEREO_INTERLEAVED); STEREO_MONO : STEREO_INTERLEAVED);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);

1
lib/rbcodec/dsp/dsp_core.h
View file

@ -35,7 +35,6 @@ enum dsp_settings
DSP_INIT, /* For dsp_init */ DSP_INIT, /* For dsp_init */
DSP_RESET, DSP_RESET,
DSP_SET_FREQUENCY, DSP_SET_FREQUENCY,
DSP_SWITCH_FREQUENCY = DSP_SET_FREQUENCY, /* deprecated */
DSP_SET_SAMPLE_DEPTH, DSP_SET_SAMPLE_DEPTH,
DSP_SET_STEREO_MODE, DSP_SET_STEREO_MODE,
DSP_FLUSH, DSP_FLUSH,

2
lib/rbcodec/test/warble.c
View file

@ -577,7 +577,7 @@ static void ci_configure(int setting, intptr_t value)
dsp_configure(ci.dsp, setting, value); dsp_configure(ci.dsp, setting, value);
} else { } else {
if (setting == DSP_SET_FREQUENCY if (setting == DSP_SET_FREQUENCY
|| setting == DSP_SWITCH_FREQUENCY) || setting == DSP_SET_FREQUENCY)
format.freq = value; format.freq = value;
else if (setting == DSP_SET_SAMPLE_DEPTH) else if (setting == DSP_SET_SAMPLE_DEPTH)
format.depth = value; format.depth = value;