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

Refactor alac decoder as preparation for upcoming m4a changes. The alac decoder does not need to use get_sample_info() to gather frame size or the number of consumed bytes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29724 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-04-16 19:08:50 +00:00
parent e4dd514e6f
commit 19f9fd0f5f
3 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/codecs/alac.c
View file

@ -35,8 +35,6 @@ enum codec_status codec_main(void)
stream_t input_stream;
uint32_t samplesdone;
uint32_t elapsedtime;
uint32_t sample_duration;
uint32_t sample_byte_size;
int samplesdecoded;
unsigned int i;
unsigned char* buffer;
@ -112,18 +110,9 @@ enum codec_status codec_main(void)
ci->seek_complete();
}
/* Lookup the length (in samples and bytes) of block i */
if (!get_sample_info(&demux_res, i, &sample_duration,
&sample_byte_size)) {
LOGF("ALAC: Error in get_sample_info\n");
retval = CODEC_ERROR;
goto done;
}
/* Request the required number of bytes from the input buffer */
buffer=ci->request_buffer(&n,sample_byte_size);
if (n!=sample_byte_size) {
buffer=ci->request_buffer(&n, demux_res.sample_byte_size[i]);
if (n!=demux_res.sample_byte_size[i]) {
retval = CODEC_ERROR;
goto done;
}
@ -132,15 +121,15 @@ enum codec_status codec_main(void)
ci->yield();
samplesdecoded=alac_decode_frame(&alac, buffer, outputbuffer, ci->yield);
/* Advance codec buffer n bytes */
ci->advance_buffer(n);
/* Advance codec buffer by amount of consumed bytes */
ci->advance_buffer(alac.bytes_consumed);
/* Output the audio */
ci->yield();
ci->pcmbuf_insert(outputbuffer[0], outputbuffer[1], samplesdecoded);
/* Update the elapsed-time indicator */
samplesdone+=sample_duration;
samplesdone+=samplesdecoded;
elapsedtime=(samplesdone*10)/(ci->id3->frequency/100);
ci->set_elapsed(elapsedtime);