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

Fixed ADPCM support. 3 bit ADPCMs do not work, but those didn't seem to

Browse source 
work before either.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9197 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2006-03-22 21:52:48 +00:00
parent ec70f29f1e
commit 09ed0d6f26
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/codecs/wav.c
View file

@ -423,10 +423,10 @@ next_track:
chunksize = (1 + avgbytespersec / (50*blockalign))*blockalign; chunksize = (1 + avgbytespersec / (50*blockalign))*blockalign;
/* check that the output buffer is big enough (convert to samplespersec, /* check that the output buffer is big enough (convert to samplespersec,
then round to the blockalign multiple below) */ then round to the blockalign multiple below) */
if (((uint64_t)chunksize*ci->id3->frequency*channels*sizeof(long)) if (((uint64_t)chunksize*ci->id3->frequency*channels*2)
/(uint64_t)avgbytespersec >= WAV_CHUNK_SIZE) { /(uint64_t)avgbytespersec >= WAV_CHUNK_SIZE) {
chunksize = ((uint64_t)WAV_CHUNK_SIZE*avgbytespersec chunksize = ((uint64_t)WAV_CHUNK_SIZE*avgbytespersec
/((uint64_t)ci->id3->frequency*channels*sizeof(long) /((uint64_t)ci->id3->frequency*channels*2
*blockalign))*blockalign; *blockalign))*blockalign;
} }
@ -500,14 +500,15 @@ next_track:
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
size_t decodedsize = samplesperblock*channels; size_t decodedsize = samplesperblock*channels;
if (decode_dvi_adpcm(ci, ((uint8_t *)wavbuf) + i*blockalign, if (decode_dvi_adpcm(ci, wavbuf + i*blockalign,
blockalign, channels, bitspersample, blockalign, channels, bitspersample,
samples + i*samplesperblock*channels, samples + i*samplesperblock*channels,
&decodedsize) != CODEC_OK) &decodedsize) != CODEC_OK) {
i = CODEC_ERROR; i = CODEC_ERROR;
goto exit; goto exit;
}
} }
bufsize = nblocks*samplesperblock*channels*2; bufsize = nblocks*samplesperblock*channels*4;
} else { } else {
DEBUGF("CODEC_ERROR: unsupported format %x\n", formattag); DEBUGF("CODEC_ERROR: unsupported format %x\n", formattag);
i = CODEC_ERROR; i = CODEC_ERROR;
@ -561,7 +562,7 @@ decode_dvi_adpcm(struct codec_api *ci,
for (c = 0; c < channels && n >= 4; c++) { for (c = 0; c < channels && n >= 4; c++) {
/* decode + push first sample */ /* decode + push first sample */
sample[c] = (short)(buf[0]|(buf[1]<<8));/* need cast for sign-extend */ sample[c] = (short)(buf[0]|(buf[1]<<8));/* need cast for sign-extend */
pcmout[c] = sample[c]; pcmout[c] = sample[c] << 13;
nsamples++; nsamples++;
stepindex[c] = buf[2]; stepindex[c] = buf[2];
/* check for step table index overflow */ /* check for step table index overflow */