len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Voice buffer can be much, much smaller. Code cleanup, logf fix

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26354 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2010-05-28 13:21:24 +00:00
parent 0ae59df3fa
commit c8944c09c2
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/pcmbuf.c
View file

@ -47,8 +47,10 @@
non-fatal) */ non-fatal) */
#define PCMBUF_MIN_CHUNK 4096 /* We try to never feed a chunk smaller than #define PCMBUF_MIN_CHUNK 4096 /* We try to never feed a chunk smaller than
this to the DMA */ this to the DMA */
#define PCMBUF_MIX_CHUNK 8192 /* This is the maximum size of one packet #define CROSSFADE_BUFSIZE 8192 /* Size of the crossfade buffer */
for mixing (crossfade or voice) */ #define AUX_BUFSIZE 512 /* Size of the aux buffer; can be 512 if no
resampling or timestretching is allowed in
the aux channel, must be 2048 otherwise */
/* number of bytes played per second (sample rate * 2 channels * 2 bytes/sample) */ /* number of bytes played per second (sample rate * 2 channels * 2 bytes/sample) */
#define BYTERATE (NATIVE_FREQUENCY * 4) #define BYTERATE (NATIVE_FREQUENCY * 4)
@ -64,7 +66,7 @@
* by the driver code. */ * by the driver code. */
struct chunkdesc struct chunkdesc
{ {
void *addr; unsigned char *addr;
size_t size; size_t size;
struct chunkdesc* link; struct chunkdesc* link;
/* true if last chunk in the track */ /* true if last chunk in the track */
@ -376,7 +378,7 @@ void *pcmbuf_request_buffer(int *count)
/* crossfade has begun, put the new track samples in fadebuf */ /* crossfade has begun, put the new track samples in fadebuf */
if (crossfade_active) if (crossfade_active)
{ {
*count = MIN(*count, PCMBUF_MIX_CHUNK/4); *count = MIN(*count, CROSSFADE_BUFSIZE/4);
return fadebuf; return fadebuf;
} }
else else
@ -464,9 +466,9 @@ size_t pcmbuf_init(unsigned char *bufend)
pcmbuf_size = get_next_required_pcmbuf_size(); pcmbuf_size = get_next_required_pcmbuf_size();
write_chunk = (struct chunkdesc *)pcmbuf_bufend - write_chunk = (struct chunkdesc *)pcmbuf_bufend -
NUM_CHUNK_DESCS(pcmbuf_size); NUM_CHUNK_DESCS(pcmbuf_size);
voicebuf = (char *)write_chunk - PCMBUF_MIX_CHUNK; voicebuf = (char *)write_chunk - AUX_BUFSIZE;
#ifdef HAVE_CROSSFADE #ifdef HAVE_CROSSFADE
fadebuf = voicebuf - PCMBUF_MIX_CHUNK; fadebuf = voicebuf - CROSSFADE_BUFSIZE;
pcmbuffer = fadebuf - pcmbuf_size; pcmbuffer = fadebuf - pcmbuf_size;
#else #else
pcmbuffer = voicebuf - pcmbuf_size; pcmbuffer = voicebuf - pcmbuf_size;
@ -623,14 +625,12 @@ static void pcmbuf_pcm_callback(unsigned char** start, size_t* size)
} }
{ {
/* Send the new chunk to the PCM */ /* Send the new chunk to the DMA */
if(read_chunk) if(read_chunk)
{ {
size_t current_size = read_chunk->size; last_chunksize = read_chunk->size;
pcmbuf_unplayed_bytes -= last_chunksize;
pcmbuf_unplayed_bytes -= current_size; *size = last_chunksize;
last_chunksize = current_size;
*size = current_size;
*start = read_chunk->addr; *start = read_chunk->addr;
} }
else else
@ -654,7 +654,7 @@ void pcmbuf_play_start(void)
last_chunksize = read_chunk->size; last_chunksize = read_chunk->size;
pcmbuf_unplayed_bytes -= last_chunksize; pcmbuf_unplayed_bytes -= last_chunksize;
pcm_play_data(pcmbuf_pcm_callback, pcm_play_data(pcmbuf_pcm_callback,
(unsigned char *)read_chunk->addr, last_chunksize); read_chunk->addr, last_chunksize);
} }
} }
@ -715,7 +715,7 @@ static size_t find_chunk(size_t length, struct chunkdesc **chunk)
length -= (*chunk)->size; length -= (*chunk)->size;
*chunk = (*chunk)->link; *chunk = (*chunk)->link;
} }
return length / 2; return length;
} }
/* Returns the number of bytes _NOT_ mixed/faded */ /* Returns the number of bytes _NOT_ mixed/faded */
@ -808,7 +808,7 @@ static void crossfade_start(void)
* so find the right chunk and sample to start the crossfade */ * so find the right chunk and sample to start the crossfade */
{ {
crossfade_sample = find_chunk(crossfade_rem - crossfade_need, crossfade_sample = find_chunk(crossfade_rem - crossfade_need,
&crossfade_chunk); &crossfade_chunk) / 2;
crossfade_rem = crossfade_need; crossfade_rem = crossfade_need;
} }
else else
@ -842,7 +842,7 @@ static void crossfade_start(void)
/* Find the right chunk and sample to start fading out */ /* Find the right chunk and sample to start fading out */
fade_out_delay += crossfade_sample * 2; fade_out_delay += crossfade_sample * 2;
fade_out_sample = find_chunk(fade_out_delay, &fade_out_chunk); fade_out_sample = find_chunk(fade_out_delay, &fade_out_chunk) / 2;
while (fade_out_rem > 0) while (fade_out_rem > 0)
{ {
@ -869,7 +869,7 @@ static void crossfade_start(void)
/* Find the right chunk and sample to start fading in */ /* Find the right chunk and sample to start fading in */
fade_in_delay += crossfade_sample * 2; fade_in_delay += crossfade_sample * 2;
crossfade_sample = find_chunk(fade_in_delay, &crossfade_chunk); crossfade_sample = find_chunk(fade_in_delay, &crossfade_chunk) / 2;
logf("crossfade_start done!"); logf("crossfade_start done!");
} }
@ -1020,7 +1020,7 @@ void *pcmbuf_request_voice_buffer(int *count)
else if (pcmbuf_usage() >= 10 && pcmbuf_mix_free() >= 30 && else if (pcmbuf_usage() >= 10 && pcmbuf_mix_free() >= 30 &&
(mix_chunk || read_chunk->link)) (mix_chunk || read_chunk->link))
{ {
*count = MIN(*count, PCMBUF_MIX_CHUNK/4); *count = MIN(*count, AUX_BUFSIZE/4);
return voicebuf; return voicebuf;
} }
else else
@ -1072,7 +1072,7 @@ void pcmbuf_write_voice_complete(int count)
if (!mix_chunk) if (!mix_chunk)
return; return;
pcmbuf_mix_sample = 0; pcmbuf_mix_sample = 0;
obuf = mix_chunk->addr; obuf = (int16_t *)mix_chunk->addr;
chunk_samples = mix_chunk->size / 2; chunk_samples = mix_chunk->size / 2;
} }
sample += obuf[pcmbuf_mix_sample] >> 2; sample += obuf[pcmbuf_mix_sample] >> 2;
@ -1088,7 +1088,7 @@ size_t pcmbuf_free(void)
{ {
if (read_chunk != NULL) if (read_chunk != NULL)
{ {
void *read = read_chunk->addr; void *read = (void *)read_chunk->addr;
void *write = &pcmbuffer[pcmbuffer_pos + pcmbuffer_fillpos]; void *write = &pcmbuffer[pcmbuffer_pos + pcmbuffer_fillpos];
if (read < write) if (read < write)
return (size_t)(read - write) + pcmbuf_size; return (size_t)(read - write) + pcmbuf_size;

2
apps/voice_thread.c
View file

@ -256,7 +256,7 @@ static void voice_message(struct voice_thread_data *td)
return; return;
case Q_VOICE_STOP: case Q_VOICE_STOP:
LOGFQUEUE("voice < Q_VOICE_STOP: %ld", td->ev.data); LOGFQUEUE("voice < Q_VOICE_STOP: %ld", (long)td->ev.data);
if (td->ev.data != 0 && !playback_is_playing()) if (td->ev.data != 0 && !playback_is_playing())
{ {