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

An attempt to fix the intermittent address error problems

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1420 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-07-23 15:10:31 +00:00
parent 2f4b88e9bb
commit 80b285cdb3
1 changed files with 52 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

99
firmware/mpeg.c
View file

@ -523,7 +523,7 @@ static void mpeg_thread(void)
while(1) while(1)
{ {
DEBUGF("S R:%x W:%x SW:%x\n", DEBUGF("S R:%x W:%x SW:%x\n",
mp3buf_read, mp3buf_write, mp3buf_swapwrite); mp3buf_read, mp3buf_write, mp3buf_swapwrite);
yield(); yield();
queue_wait(&mpeg_queue, &ev); queue_wait(&mpeg_queue, &ev);
switch(ev.id) switch(ev.id)
@ -595,16 +595,16 @@ static void mpeg_thread(void)
close(mpeg_file); close(mpeg_file);
last_tag=0; last_tag=0;
if (new_file(true) < 0) { if (new_file(true) < 0) {
DEBUGF("Finished Playing!\n"); DEBUGF("Finished Playing!\n");
filling = false; filling = false;
} else { } else {
/* Make it read more data */ /* Make it read more data */
filling = true; filling = true;
queue_post(&mpeg_queue, MPEG_NEED_DATA, 0); queue_post(&mpeg_queue, MPEG_NEED_DATA, 0);
/* Tell the file loading code that we want to start playing /* Tell the file loading code that we want to start playing
as soon as we have some data */ as soon as we have some data */
play_pending = true; play_pending = true;
} }
break; break;
@ -621,16 +621,16 @@ static void mpeg_thread(void)
close(mpeg_file); close(mpeg_file);
last_tag=0; last_tag=0;
if (new_file(false) < 0) { if (new_file(false) < 0) {
DEBUGF("Finished Playing!\n"); DEBUGF("Finished Playing!\n");
filling = false; filling = false;
} else { } else {
/* Make it read more data */ /* Make it read more data */
filling = true; filling = true;
queue_post(&mpeg_queue, MPEG_NEED_DATA, 0); queue_post(&mpeg_queue, MPEG_NEED_DATA, 0);
/* Tell the file loading code that we want to start playing /* Tell the file loading code that we want to start playing
as soon as we have some data */ as soon as we have some data */
play_pending = true; play_pending = true;
} }
break; break;
@ -643,13 +643,13 @@ static void mpeg_thread(void)
if(free_space_left < 0) if(free_space_left < 0)
free_space_left = mp3buflen + free_space_left; free_space_left = mp3buflen + free_space_left;
amount_to_swap = MIN(MPEG_SWAP_CHUNKSIZE, free_space_left); amount_to_swap = MIN(MPEG_SWAP_CHUNKSIZE, free_space_left);
if(mp3buf_write < mp3buf_swapwrite) if(mp3buf_write < mp3buf_swapwrite)
amount_to_swap = MIN(mp3buflen - mp3buf_swapwrite, amount_to_swap = MIN(mp3buflen - mp3buf_swapwrite,
amount_to_swap); amount_to_swap);
else else
amount_to_swap = MIN(mp3buf_write - mp3buf_swapwrite, amount_to_swap = MIN(mp3buf_write - mp3buf_swapwrite,
amount_to_swap); amount_to_swap);
DEBUGF("B %x\n", amount_to_swap); DEBUGF("B %x\n", amount_to_swap);
bitswap((unsigned short *)(mp3buf + mp3buf_swapwrite), bitswap((unsigned short *)(mp3buf + mp3buf_swapwrite),
@ -669,20 +669,20 @@ static void mpeg_thread(void)
playing yet. If not, do it. */ playing yet. If not, do it. */
if(play_pending) if(play_pending)
{ {
if((mp3buf_swapwrite - mp3buf_read) >= MPEG_LOW_WATER) if((mp3buf_swapwrite - mp3buf_read) >= MPEG_LOW_WATER)
{ {
DEBUGF("P\n"); DEBUGF("P\n");
play_pending = false; play_pending = false;
playing = true; playing = true;
last_dma_tick = current_tick; last_dma_tick = current_tick;
init_dma(); init_dma();
start_dma(); start_dma();
/* Tell ourselves that we need more data */ /* Tell ourselves that we need more data */
queue_post(&mpeg_queue, MPEG_NEED_DATA, 0); queue_post(&mpeg_queue, MPEG_NEED_DATA, 0);
} }
} }
break; break;
@ -693,7 +693,7 @@ static void mpeg_thread(void)
if(free_space_left <= 0) if(free_space_left <= 0)
free_space_left = mp3buflen + free_space_left; free_space_left = mp3buflen + free_space_left;
unplayed_space_left = mp3buflen - free_space_left; unplayed_space_left = mp3buflen - free_space_left;
/* Make sure that we don't fill the entire buffer */ /* Make sure that we don't fill the entire buffer */
free_space_left -= 2; free_space_left -= 2;
@ -713,11 +713,11 @@ static void mpeg_thread(void)
} }
else else
{ {
if(unplayed_space_left < MPEG_LOW_WATER) if(unplayed_space_left < MPEG_LOW_WATER)
amount_to_read = MIN(MPEG_LOW_WATER_CHUNKSIZE, amount_to_read = MIN(MPEG_LOW_WATER_CHUNKSIZE,
free_space_left); free_space_left);
else else
amount_to_read = MIN(MPEG_CHUNKSIZE, free_space_left); amount_to_read = MIN(MPEG_CHUNKSIZE, free_space_left);
} }
amount_to_read = MIN(mp3buflen - mp3buf_write, amount_to_read); amount_to_read = MIN(mp3buflen - mp3buf_write, amount_to_read);
@ -731,10 +731,15 @@ static void mpeg_thread(void)
len = read(mpeg_file, mp3buf+mp3buf_write, amount_to_read); len = read(mpeg_file, mp3buf+mp3buf_write, amount_to_read);
if(len > 0) if(len > 0)
{ {
DEBUGF("R: %x\n", len); DEBUGF("R: %x\n", len);
/* Tell ourselves that we need to swap some data */ /* Tell ourselves that we need to swap some data */
queue_post(&mpeg_queue, MPEG_SWAP_DATA, 0); queue_post(&mpeg_queue, MPEG_SWAP_DATA, 0);
/* Make sure that the write pointer is at a word
boundary when we reach the end of the file */
if(len < amount_to_read)
mp3buf_write = (mp3buf_write + 1) & 0xfffffffe;
mp3buf_write += len; mp3buf_write += len;
if(mp3buf_write >= mp3buflen) if(mp3buf_write >= mp3buflen)
{ {
@ -742,11 +747,11 @@ static void mpeg_thread(void)
DEBUGF("W\n"); DEBUGF("W\n");
} }
if(!play_pending) if(!play_pending)
{ {
/* Tell ourselves that we want more data */ /* Tell ourselves that we want more data */
queue_post(&mpeg_queue, MPEG_NEED_DATA, 0); queue_post(&mpeg_queue, MPEG_NEED_DATA, 0);
} }
} }
else else
{ {