Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

If seek fails, don't insert nonsense for the current position. Also, make one of the error messages a bit more clear.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16002 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Giacomelli 2008-01-06 02:50:01 +00:00
parent 6202def6dc
commit dadd80a8a6
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/codecs/libwma/wmadeci.c
View file

@ -130,7 +130,7 @@ void vector_fmul_add_add(fixed32 *dst, const fixed32 *data,
const fixed32 *window, int n)
{
/* Block sizes are always power of two. Smallest block is always way bigger
* than four too.*/
* than four too.*/
asm volatile (
"0:"
"movem.l (%[d]), %%d0-%%d3;"
@ -160,7 +160,7 @@ void vector_fmul_reverse(fixed32 *dst, const fixed32 *src0, const fixed32 *src1,
int len)
{
/* Block sizes are always power of two. Smallest block is always way bigger
* than four too.*/
* than four too.*/
asm volatile (
"lea.l (-16, %[s1], %[n]*4), %[s1];"
"0:"
@ -906,7 +906,7 @@ static int wma_decode_block(WMADecodeContext *s)
int nb_coefs[MAX_CHANNELS];
fixed32 mdct_norm;
DEBUGF("***decode_block: %d of (%d samples) (%d)\n", s->block_num, s->frame_len, s->block_len);
DEBUGF("***decode_block: %d (%d samples of %d in frame)\n", s->block_num, s->frame_len, s->block_len);
/* compute current block length */
if (s->use_variable_block_len)
@ -959,7 +959,7 @@ static int wma_decode_block(WMADecodeContext *s)
if ((s->block_pos + s->block_len) > s->frame_len)
{
return -5;
return -5; //oddly 32k sample from tracker fails here
}
if (s->nb_channels == 2)
@ -1421,7 +1421,7 @@ static int wma_decode_frame(WMADecodeContext *s, int32_t *samples)
if (ret < 0)
{
//rb->splash(HZ*4, "wma_decode_block failed with ret %d", ret);
DEBUGF("wma_decode_block failed with code %d\n", ret);
return -1;
}
if (ret)
@ -1500,7 +1500,6 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
int pos, len;
uint8_t *q;
int done = 0;
if ((s->use_bit_reservoir) && (s->current_frame == 0))
{
if (s->last_superframe_len > 0)
@ -1509,6 +1508,7 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
if ((s->last_superframe_len + ((s->bit_offset + 7) >> 3)) >
MAX_CODED_SUPERFRAME_SIZE)
{
DEBUGF("superframe size too large error\n");
goto fail;
}
q = s->last_superframe + s->last_superframe_len;
@ -1568,6 +1568,7 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
len = buf_size - pos;
if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0)
{
DEBUGF("superframe size too large error after decodeing\n");
goto fail;
}
s->last_superframe_len = len;
@ -1578,6 +1579,7 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
fail:
/* when error, we reset the bit reservoir */
s->last_superframe_len = 0;
return -1;
}

7
apps/codecs/wma.c
View file

@ -354,7 +354,7 @@ static int get_timestamp(int *duration)
ec_length = 0;
}
if (ci->read_filebuf(&packet_flags, 1) == 0) {
if (ci->read_filebuf(&packet_flags, 1) == 0) {
DEBUGF("Detected end of stream 2\n");
return ASF_ERROR_EOF;
}
@ -425,7 +425,8 @@ static int seek(int ms, asf_waveformatex_t* wfx)
/*unknown error, try to recover*/
DEBUGF("UKNOWN SEEK ERROR\n");
ci->seek_buffer(ci->id3->first_frame_offset+initial_packet*wfx->packet_size);
return ms;
/*seek failed so return time stamp of the initial packet*/
return get_timestamp(&duration);
}
if ((time+duration>=ms && time<=ms) || count > 10) {
@ -550,7 +551,7 @@ new_packet:
*/
errcount++;
DEBUGF("WMA decode error %d, errcount %d\n",wmares, errcount);
DEBUGF("read_packet error %d, errcount %d\n",wmares, errcount);
if (errcount > 5) {
goto done;
} else {