1
0
Fork 0
forked from len0rd/rockbox

ima adpcm/swf adpcm: corrects the problem the noise occurs after the play ends.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25052 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Yoshihisa Uchida 2010-03-07 07:27:45 +00:00
parent f640b89a12
commit 1e9789879f
2 changed files with 38 additions and 44 deletions

View file

@ -47,6 +47,8 @@ static bool after_seek = false;
static struct pcm_format *fmt;
#define GET_SAMPLE_COUNT(s) ((((s) << 3) / fmt->channels - 22) / fmt->bitspersample + 1)
static bool set_format(struct pcm_format *format)
{
fmt = format;
@ -139,14 +141,14 @@ static int decode(const uint8_t *inbuf, size_t inbufsize,
{
int ch;
int adpcm_code_size;
int count = fmt->samplesperblock;
int count = ((size_t)fmt->chunksize == inbufsize) ? fmt->samplesperblock :
GET_SAMPLE_COUNT(inbufsize);
int32_t init_pcmdata[2];
int8_t init_index[2];
static uint8_t lastbyte = 0;
(void)inbufsize;
validity_bits = 8;
*outbufcount = count;
/* read block header */
ch = fmt->channels - 1;
@ -208,8 +210,6 @@ static int decode(const uint8_t *inbuf, size_t inbufsize,
<< IMA_ADPCM_INC_DEPTH;
}
*outbufcount = fmt->samplesperblock;
lastbyte = *inbuf;
lastbytebits = (8 - validity_bits) & 0x07;