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

Use direct non-interleaved full precision output data instead of converting to 16 bit interleaved data.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7734 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2005-11-02 19:43:52 +00:00
parent 3661215134
commit 0263ece7f8
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/codecs/aac.c
View file

@ -66,8 +66,8 @@ enum codec_status codec_start(struct codec_api* api)
ci->configure(CODEC_DSP_ENABLE, (bool *)true); ci->configure(CODEC_DSP_ENABLE, (bool *)true);
ci->configure(DSP_DITHER, (bool *)false); ci->configure(DSP_DITHER, (bool *)false);
ci->configure(DSP_SET_STEREO_MODE, (int *)STEREO_INTERLEAVED); ci->configure(DSP_SET_STEREO_MODE, (int *)STEREO_NONINTERLEAVED);
ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(16)); ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(29));
next_track: next_track:
@ -100,7 +100,7 @@ enum codec_status codec_start(struct codec_api* api)
} }
NeAACDecConfigurationPtr conf = NeAACDecGetCurrentConfiguration(hDecoder); NeAACDecConfigurationPtr conf = NeAACDecGetCurrentConfiguration(hDecoder);
conf->outputFormat = 1; // 16-bit integers conf->outputFormat = FAAD_FMT_24BIT; /* irrelevant, we don't convert */
NeAACDecSetConfiguration(hDecoder, conf); NeAACDecSetConfiguration(hDecoder, conf);
unsigned long s=0; unsigned long s=0;
@ -147,7 +147,8 @@ enum codec_status codec_start(struct codec_api* api)
/* Decode one block - returned samples will be host-endian */ /* Decode one block - returned samples will be host-endian */
rb->yield(); rb->yield();
decodedbuffer = NeAACDecDecode(hDecoder, &frameInfo, buffer, n); decodedbuffer = NeAACDecDecode(hDecoder, &frameInfo, buffer, n);
/* ignore decodedbuffer return value, we access samples in the
decoder struct directly */
if (frameInfo.error > 0) { if (frameInfo.error > 0) {
LOGF("FAAD: decoding error \"%s\"\n", NeAACDecGetErrorMessage(frameInfo.error)); LOGF("FAAD: decoding error \"%s\"\n", NeAACDecGetErrorMessage(frameInfo.error));
return CODEC_ERROR; return CODEC_ERROR;
@ -161,7 +162,9 @@ enum codec_status codec_start(struct codec_api* api)
/* Output the audio */ /* Output the audio */
rb->yield(); rb->yield();
while (!rb->pcmbuf_insert((char*)decodedbuffer, frameInfo.samples << 1)) while (!rb->pcmbuf_insert_split(hDecoder->time_out[0],
hDecoder->time_out[1],
frameInfo.samples*2))
rb->yield(); rb->yield();
/* Update the elapsed-time indicator */ /* Update the elapsed-time indicator */

3
apps/codecs/libfaad/decoder.c
View file

@ -982,9 +982,10 @@ static void* aac_frame_decode(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo,
} }
#endif #endif
/* we don't need sample conversion in rockbox.
sample_buffer = output_to_PCM(hDecoder, hDecoder->time_out, sample_buffer, sample_buffer = output_to_PCM(hDecoder, hDecoder->time_out, sample_buffer,
output_channels, frame_len, hDecoder->config.outputFormat); output_channels, frame_len, hDecoder->config.outputFormat);
*/
hDecoder->postSeekResetFlag = 0; hDecoder->postSeekResetFlag = 0;