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

Fast forward near the end of the last song in a playlist didn't activate the DMA if the remaining amount to play was below the watermark

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2754 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-10-28 00:00:07 +00:00
parent a12eb3d892
commit c5e29938c4
1 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

75
firmware/mpeg.c
View file

@ -841,40 +841,9 @@ void hexdump(unsigned char *buf, int len)
} }
#endif #endif
static void swap_one_chunk(void) static void start_playback_if_ready(void)
{ {
int free_space_left; /* See if we have started playing yet. If not, do it. */
int amount_to_swap;
free_space_left = get_unswapped_space();
if(free_space_left == 0 && !play_pending)
return;
/* Swap in larger chunks when the user is waiting for the playback
to start */
if(play_pending)
amount_to_swap = MIN(MPEG_LOW_WATER_CHUNKSIZE, free_space_left);
else
amount_to_swap = MIN(MPEG_SWAP_CHUNKSIZE, free_space_left);
if(mp3buf_write < mp3buf_swapwrite)
amount_to_swap = MIN(mp3buflen - mp3buf_swapwrite,
amount_to_swap);
else
amount_to_swap = MIN(mp3buf_write - mp3buf_swapwrite,
amount_to_swap);
bitswap(mp3buf + mp3buf_swapwrite, amount_to_swap);
mp3buf_swapwrite += amount_to_swap;
if(mp3buf_swapwrite >= mp3buflen)
{
mp3buf_swapwrite = 0;
}
/* And while we're at it, see if we have started
playing yet. If not, do it. */
if(play_pending || dma_underrun) if(play_pending || dma_underrun)
{ {
/* If the filling has stopped, and we still haven't reached /* If the filling has stopped, and we still haven't reached
@ -900,6 +869,41 @@ static void swap_one_chunk(void)
} }
} }
static bool swap_one_chunk(void)
{
int free_space_left;
int amount_to_swap;
free_space_left = get_unswapped_space();
if(free_space_left == 0 && !play_pending)
return false;
/* Swap in larger chunks when the user is waiting for the playback
to start */
if(play_pending)
amount_to_swap = MIN(MPEG_LOW_WATER_CHUNKSIZE, free_space_left);
else
amount_to_swap = MIN(MPEG_SWAP_CHUNKSIZE, free_space_left);
if(mp3buf_write < mp3buf_swapwrite)
amount_to_swap = MIN(mp3buflen - mp3buf_swapwrite,
amount_to_swap);
else
amount_to_swap = MIN(mp3buf_write - mp3buf_swapwrite,
amount_to_swap);
bitswap(mp3buf + mp3buf_swapwrite, amount_to_swap);
mp3buf_swapwrite += amount_to_swap;
if(mp3buf_swapwrite >= mp3buflen)
{
mp3buf_swapwrite = 0;
}
return true;
}
static void mpeg_thread(void) static void mpeg_thread(void)
{ {
static int pause_tick = 0; static int pause_tick = 0;
@ -922,9 +926,8 @@ static void mpeg_thread(void)
yield(); yield();
/* Swap if necessary, and don't block on the queue_wait() */ /* Swap if necessary, and don't block on the queue_wait() */
if(get_unswapped_space()) if(swap_one_chunk())
{ {
swap_one_chunk();
queue_wait_w_tmo(&mpeg_queue, &ev, 0); queue_wait_w_tmo(&mpeg_queue, &ev, 0);
} }
else else
@ -933,6 +936,8 @@ static void mpeg_thread(void)
mp3buf_read, mp3buf_write, mp3buf_swapwrite); mp3buf_read, mp3buf_write, mp3buf_swapwrite);
queue_wait(&mpeg_queue, &ev); queue_wait(&mpeg_queue, &ev);
} }
start_playback_if_ready();
switch(ev.id) switch(ev.id)
{ {