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

Get voice PCM queue indexes updating in right order...

Browse source 
...from the compiled code standpoint anyway. frame_out was being
incremented before updating size...sometimes...depending on what
GCC was up to. This seems to help.

Change-Id: Ie4ee3337a2937bd2c26f0a9c4a1a00467954821b
This commit is contained in:
Michael Sevakis 2012-05-30 12:55:26 -04:00
parent 7a009276bc
commit 77220147b5
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/voice_thread.c
View file

@ -143,7 +143,8 @@ static struct voice_buf
/* Buffer for decoded samples */ /* Buffer for decoded samples */
spx_int16_t spx_outbuf[VOICE_FRAME_COUNT]; spx_int16_t spx_outbuf[VOICE_FRAME_COUNT];
/* Queue frame indexes */ /* Queue frame indexes */
unsigned int frame_in, frame_out; unsigned int volatile frame_in;
unsigned int volatile frame_out;
/* For PCM pointer adjustment */ /* For PCM pointer adjustment */
struct voice_thread_data *td; struct voice_thread_data *td;
/* Buffers for mixing voice */ /* Buffers for mixing voice */
@ -197,7 +198,7 @@ static struct buflib_callbacks ops =
}; };
/* Number of frames in queue */ /* Number of frames in queue */
static inline int voice_unplayed_frames(void) static unsigned int voice_unplayed_frames(void)
{ {
return voice_buf->frame_in - voice_buf->frame_out; return voice_buf->frame_in - voice_buf->frame_out;
} }
@ -205,11 +206,13 @@ static inline int voice_unplayed_frames(void)
/* Mixer channel callback */ /* Mixer channel callback */
static void voice_pcm_callback(const void **start, size_t *size) static void voice_pcm_callback(const void **start, size_t *size)
{ {
unsigned int frame_out = ++voice_buf->frame_out;
if (voice_unplayed_frames() == 0) if (voice_unplayed_frames() == 0)
return; /* Done! */ return; /* Done! */
struct voice_pcm_frame *frame = struct voice_pcm_frame *frame =
&voice_buf->frames[++voice_buf->frame_out % VOICE_FRAMES]; &voice_buf->frames[frame_out % VOICE_FRAMES];
*start = frame->pcm; *start = frame->pcm;
*size = frame->size; *size = frame->size;
@ -219,7 +222,7 @@ static void voice_pcm_callback(const void **start, size_t *size)
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) voice_unplayed_frames() == 0)
return; return;
struct voice_pcm_frame *frame = struct voice_pcm_frame *frame =
@ -254,8 +257,10 @@ static void voice_buf_commit(int count)
{ {
if (count > 0) if (count > 0)
{ {
voice_buf->frames[voice_buf->frame_in++ % VOICE_FRAMES].size = unsigned int frame_in = voice_buf->frame_in;
voice_buf->frames[frame_in % VOICE_FRAMES].size =
count * 2 * sizeof (int16_t); count * 2 * sizeof (int16_t);
voice_buf->frame_in = frame_in + 1;
} }
} }