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

Fix a crossfade problem (not initializing quite right), and a end of track problem (should solve some problemwith last bits of audio not playing).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9736 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-04-20 02:30:59 +00:00
parent 195a9f2766
commit 37faaab0ee
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/pcmbuf.c
View file

@ -107,6 +107,7 @@ static bool low_latency_mode = false;
static void pcmbuf_flush_audio(void); static void pcmbuf_flush_audio(void);
static void pcmbuf_under_watermark(void); static void pcmbuf_under_watermark(void);
static bool pcmbuf_flush_fillpos(void);
#if defined(HAVE_ADJUSTABLE_CPU_FREQ) && !defined(SIMULATOR) #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && !defined(SIMULATOR)
void pcmbuf_boost(bool state) void pcmbuf_boost(bool state)
@ -152,6 +153,7 @@ static void pcmbuf_callback(unsigned char** start, size_t* size)
pcmbuf_write_end = pcmbuf_current; pcmbuf_write_end = pcmbuf_current;
} }
process_new_buffer:
{ {
/* Send the new buffer to the pcm */ /* Send the new buffer to the pcm */
struct pcmbufdesc *pcmbuf_new = pcmbuf_read; struct pcmbufdesc *pcmbuf_new = pcmbuf_read;
@ -167,6 +169,10 @@ static void pcmbuf_callback(unsigned char** start, size_t* size)
} }
else else
{ {
/* There may be more data waiting to flush, try to use it */
if (pcmbuf_flush_fillpos())
goto process_new_buffer;
/* No more buffers */ /* No more buffers */
last_chunksize = 0; last_chunksize = 0;
*realsize = 0; *realsize = 0;
@ -405,7 +411,7 @@ void pcmbuf_play_start(void)
/** /**
* Commit samples waiting to the pcm buffer. * Commit samples waiting to the pcm buffer.
*/ */
static void pcmbuf_flush_fillpos(void) static bool pcmbuf_flush_fillpos(void)
{ {
if (audiobuffer_fillpos) { if (audiobuffer_fillpos) {
/* Never use the last buffer descriptor */ /* Never use the last buffer descriptor */
@ -422,7 +428,9 @@ static void pcmbuf_flush_fillpos(void)
sleep(PCMBUF_TARGET_CHUNK/(NATIVE_FREQUENCY * 4) / 5); sleep(PCMBUF_TARGET_CHUNK/(NATIVE_FREQUENCY * 4) / 5);
} }
pcmbuf_add_chunk(); pcmbuf_add_chunk();
return true;
} }
return false;
} }
/** /**
@ -486,7 +494,7 @@ static void crossfade_start(void)
unsigned int fade_out_delay = 0; unsigned int fade_out_delay = 0;
unsigned fade_in_delay = 0; unsigned fade_in_delay = 0;
crossfade_init = 0; crossfade_init = false;
/* Reject crossfade if less than .5s of data */ /* Reject crossfade if less than .5s of data */
if (LOW_DATA(2)) { if (LOW_DATA(2)) {
logf("crossfade rejected"); logf("crossfade rejected");
@ -693,9 +701,6 @@ static void flush_crossfade(const char *buf, size_t length) {
static bool prepare_insert(size_t length) static bool prepare_insert(size_t length)
{ {
if (crossfade_init)
crossfade_start();
if (low_latency_mode) if (low_latency_mode)
{ {
/* 1/4s latency. */ /* 1/4s latency. */
@ -729,6 +734,9 @@ static bool prepare_insert(size_t length)
void* pcmbuf_request_buffer(size_t length, size_t *realsize) void* pcmbuf_request_buffer(size_t length, size_t *realsize)
{ {
if (crossfade_init)
crossfade_start();
if (crossfade_active) { if (crossfade_active) {
*realsize = MIN(length, PCMBUF_FADE_CHUNK); *realsize = MIN(length, PCMBUF_FADE_CHUNK);
return &guardbuf[0]; return &guardbuf[0];
@ -778,10 +786,8 @@ bool pcmbuf_is_crossfade_active(void)
void pcmbuf_write_complete(size_t length) void pcmbuf_write_complete(size_t length)
{ {
if (crossfade_active) { if (crossfade_active)
length = MIN(length, PCMBUF_FADE_CHUNK); flush_crossfade(guardbuf, length);
flush_crossfade(&guardbuf[0],length);
}
else else
{ {
audiobuffer_free -= length; audiobuffer_free -= length;
@ -798,7 +804,7 @@ bool pcmbuf_insert_buffer(const char *buf, size_t length)
return false; return false;
if (crossfade_active) { if (crossfade_active) {
flush_crossfade(buf,length); flush_crossfade(buf, length);
} }
else else
{ {