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

Add comments, and avoid throw-away calculations in crossfade buffer process

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9352 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-03-30 00:47:05 +00:00
parent 4ed232df5e
commit dbcc9c25d5
1 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

56
apps/pcmbuf.c
View file

@ -451,35 +451,43 @@ static void pcmbuf_flush_fillpos(void)
/** /**
* Completely process the crossfade fade out effect with current pcm buffer. * Completely process the crossfade fade out effect with current pcm buffer.
*/ */
static void crossfade_process_buffer(unsigned int fade_in_delay, static void crossfade_process_buffer(size_t fade_in_delay,
unsigned int fade_out_delay, size_t fade_out_rem) size_t fade_out_delay, size_t fade_out_rem)
{ {
size_t amount; if (crossfade_mode == CFM_CROSSFADE)
size_t pos;
short *buf;
/* Fade out the entire current buffer according to settings. */
amount = fade_out_rem;
pos = crossfade_pos + fade_out_delay*2;
while (fade_out_rem > 0 && crossfade_mode == CFM_CROSSFADE)
{ {
size_t blocksize = MIN(8192, fade_out_rem); /* Fade out the specified amount of the already processed audio */
int factor = (fade_out_rem<<8)/amount; size_t total_fade_out = fade_out_rem;
short *buf = (short *)&audiobuffer[crossfade_pos + fade_out_delay * 2];
short *buf_end = (short *)guardbuf;
/* Prevent pcmbuffer from wrapping. */ /* Wrap the starting position if needed */
if (pos >= pcmbuf_size) pos -= pcmbuf_size; if (buf >= buf_end) buf -= pcmbuf_size / 2;
blocksize = MIN((pcmbuf_size - pos)/2, blocksize); while (fade_out_rem > 0)
buf = (short *)&audiobuffer[pos];
fade_out_rem -= blocksize;
pos += blocksize * 2;
while (blocksize > 0)
{ {
*buf = (*buf * factor) >> 8; /* Each 1/10 second of audio will have the same fade applied */
*buf++; size_t block_rem = MIN(NATIVE_FREQUENCY * 2 / 10, fade_out_rem);
blocksize--; unsigned int factor = (fade_out_rem << 8) / total_fade_out;
short *block_end = buf + block_rem;
fade_out_rem -= block_rem;
/* Fade this block */
while (buf < block_end)
{
/* Fade one sample */
*buf = (*buf * factor) >> 8;
buf++;
if (buf >= buf_end)
{
/* Wrap the pcmbuffer */
buf -= pcmbuf_size / 2;
/* Wrap the end pointer to ensure proper termination */
block_end -= pcmbuf_size / 2;
}
}
} }
} }