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

Adjust some typing in voice_thread.c. Constants are also counts, not sizes.

Browse source 
Change-Id: I05700f6c87c775e98f05323d2ab0550fad8befd7
This commit is contained in:
Michael Sevakis 2012-04-26 15:57:07 -04:00
parent e5c3327cef
commit cfc32fe75f
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/voice_thread.c
View file

@ -59,7 +59,7 @@
latency */ latency */
#define PRIORITY_VOICE (PRIORITY_PLAYBACK-4) #define PRIORITY_VOICE (PRIORITY_PLAYBACK-4)
#define VOICE_FRAME_SIZE 320 /* Samples / frame */ #define VOICE_FRAME_COUNT 320 /* Samples / frame */
#define VOICE_SAMPLE_RATE 16000 /* Sample rate in HZ */ #define VOICE_SAMPLE_RATE 16000 /* Sample rate in HZ */
#define VOICE_SAMPLE_DEPTH 16 /* Sample depth in bits */ #define VOICE_SAMPLE_DEPTH 16 /* Sample depth in bits */
@ -81,11 +81,11 @@ static struct queue_sender_list voice_queue_sender_list SHAREDBSS_ATTR;
static int quiet_counter SHAREDDATA_ATTR = 0; static int quiet_counter SHAREDDATA_ATTR = 0;
/* Buffer for decoded samples */ /* Buffer for decoded samples */
static spx_int16_t voice_output_buf[VOICE_FRAME_SIZE] CACHEALIGN_ATTR; static spx_int16_t voice_output_buf[VOICE_FRAME_COUNT] MEM_ALIGN_ATTR;
#define VOICE_PCM_FRAME_COUNT ((NATIVE_FREQUENCY*VOICE_FRAME_SIZE + \ #define VOICE_PCM_FRAME_COUNT ((NATIVE_FREQUENCY*VOICE_FRAME_COUNT + \
VOICE_SAMPLE_RATE) / VOICE_SAMPLE_RATE) VOICE_SAMPLE_RATE) / VOICE_SAMPLE_RATE)
#define VOICE_PCM_FRAME_SIZE (VOICE_PCM_FRAME_COUNT*4) #define VOICE_PCM_FRAME_SIZE (VOICE_PCM_FRAME_COUNT*2*sizeof (int16_t))
/* Default number of native-frequency PCM frames to queue - adjust as /* Default number of native-frequency PCM frames to queue - adjust as
necessary per-target */ necessary per-target */
@ -93,7 +93,7 @@ static spx_int16_t voice_output_buf[VOICE_FRAME_SIZE] CACHEALIGN_ATTR;
/* Might have lookahead and be skipping samples, so size is needed */ /* Might have lookahead and be skipping samples, so size is needed */
static size_t voicebuf_sizes[VOICE_FRAMES]; static size_t voicebuf_sizes[VOICE_FRAMES];
static uint32_t (* voicebuf)[VOICE_PCM_FRAME_COUNT]; static int16_t (* voicebuf)[2*VOICE_PCM_FRAME_COUNT];
static unsigned int cur_buf_in, cur_buf_out; static unsigned int cur_buf_in, cur_buf_out;
/* Voice processing states */ /* Voice processing states */
@ -165,7 +165,8 @@ static void voice_pcm_callback(const void **start, size_t *size)
/* Start playback of voice channel if not already playing */ /* Start playback of voice channel if not already playing */
static void voice_start_playback(void) static void voice_start_playback(void)
{ {
if (mixer_channel_status(PCM_MIXER_CHAN_VOICE) != CHANNEL_STOPPED) if (mixer_channel_status(PCM_MIXER_CHAN_VOICE) != CHANNEL_STOPPED ||
voice_unplayed_frames() <= 0)
return; return;
unsigned int i = cur_buf_out % VOICE_FRAMES; unsigned int i = cur_buf_out % VOICE_FRAMES;
@ -181,7 +182,7 @@ static void voice_stop_playback(void)
} }
/* Grab a free PCM frame */ /* Grab a free PCM frame */
static uint32_t * voice_buf_get(void) static uint16_t * voice_buf_get(void)
{ {
if (voice_unplayed_frames() >= VOICE_FRAMES) if (voice_unplayed_frames() >= VOICE_FRAMES)
{ {
@ -194,9 +195,13 @@ static uint32_t * voice_buf_get(void)
} }
/* Commit a frame returned by voice_buf_get and set the actual size */ /* Commit a frame returned by voice_buf_get and set the actual size */
static void voice_buf_commit(size_t size) static void voice_buf_commit(int count)
{ {
voicebuf_sizes[cur_buf_in++ % VOICE_FRAMES] = size; if (count > 0)
{
voicebuf_sizes[cur_buf_in++ % VOICE_FRAMES] =
count * 2 * sizeof (int16_t);
}
} }
/* Stop any current clip and start playing a new one */ /* Stop any current clip and start playing a new one */
@ -382,10 +387,10 @@ static enum voice_state voice_decode(struct voice_thread_data *td)
yield(); yield();
/* Output the decoded frame */ /* Output the decoded frame */
td->count = VOICE_FRAME_SIZE - td->lookahead; td->count = VOICE_FRAME_COUNT - td->lookahead;
td->src[0] = (const char *)&voice_output_buf[td->lookahead]; td->src[0] = (const char *)&voice_output_buf[td->lookahead];
td->src[1] = NULL; td->src[1] = NULL;
td->lookahead -= MIN(VOICE_FRAME_SIZE, td->lookahead); td->lookahead -= MIN(VOICE_FRAME_COUNT, td->lookahead);
if (td->count > 0) if (td->count > 0)
return VOICE_STATE_BUFFER_INSERT; return VOICE_STATE_BUFFER_INSERT;
@ -404,8 +409,7 @@ static enum voice_state voice_buffer_insert(struct voice_thread_data *td)
if (dest != NULL) if (dest != NULL)
{ {
voice_buf_commit(dsp_process(td->dsp, dest, td->src, td->count) voice_buf_commit(dsp_process(td->dsp, dest, td->src, td->count));
* sizeof (int32_t));
return VOICE_STATE_DECODE; return VOICE_STATE_DECODE;
} }
@ -464,10 +468,10 @@ void voice_thread_set_priority(int priority)
#endif #endif
/* Initialize voice PCM buffer and return size, allocated from the end */ /* Initialize voice PCM buffer and return size, allocated from the end */
size_t voicebuf_init(unsigned char *bufend) size_t voicebuf_init(void *bufend)
{ {
size_t size = VOICE_FRAMES * VOICE_PCM_FRAME_SIZE; size_t size = VOICE_FRAMES * sizeof (voicebuf[0]);
cur_buf_out = cur_buf_in = 0; cur_buf_out = cur_buf_in = 0;
voicebuf = (uint32_t (*)[VOICE_PCM_FRAME_COUNT])(bufend - size); voicebuf = bufend - size;
return size; return size;
} }

2
apps/voice_thread.h
View file

@ -39,6 +39,6 @@ void voice_thread_init(void) INIT_ATTR;
void voice_thread_set_priority(int priority); void voice_thread_set_priority(int priority);
#endif #endif
size_t voicebuf_init(unsigned char *bufend); size_t voicebuf_init(void *bufend);
#endif /* VOICE_THREAD_H */ #endif /* VOICE_THREAD_H */