diff options
author | Andre Heider | 2010-08-28 12:51:12 +0000 |
---|---|---|
committer | Andre Heider | 2010-08-28 12:51:12 +0000 |
commit | 80b9e8371b3cb8ef07df3495f8569271f8088211 (patch) | |
tree | 194d26afb0dd18aae730892e9e7c7567069a45e2 /backends/platform/wii/osystem_sfx.cpp | |
parent | c45b3e4e0e66ae56d06dcf1215477cf77eecc375 (diff) | |
download | scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.gz scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.bz2 scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.zip |
WII: svn merge Wii port commits from trunk
svn-id: r52425
Diffstat (limited to 'backends/platform/wii/osystem_sfx.cpp')
-rw-r--r-- | backends/platform/wii/osystem_sfx.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/backends/platform/wii/osystem_sfx.cpp b/backends/platform/wii/osystem_sfx.cpp index d2e884aa22..33397f0a93 100644 --- a/backends/platform/wii/osystem_sfx.cpp +++ b/backends/platform/wii/osystem_sfx.cpp @@ -25,7 +25,8 @@ #define SFX_THREAD_STACKSIZE (1024 * 128) #define SFX_THREAD_PRIO 80 -#define SFX_THREAD_FRAG_SIZE 4096 +#define SFX_THREAD_FRAG_SIZE (1024 * 8) +#define SFX_BUFFERS 3 static lwpq_t sfx_queue; static lwp_t sfx_thread; @@ -33,20 +34,18 @@ static u8 *sfx_stack; static bool sfx_thread_running = false; static bool sfx_thread_quit = false; -static u8 sb = 0; -static u8 *sound_buffer[2]; +static u32 sb_hw; +static u8 *sound_buffer[SFX_BUFFERS]; static void audio_switch_buffers() { - AUDIO_StopDMA(); - AUDIO_InitDMA((u32) sound_buffer[sb], SFX_THREAD_FRAG_SIZE); - AUDIO_StartDMA(); - + sb_hw = (sb_hw + 1) % SFX_BUFFERS; + AUDIO_InitDMA((u32) sound_buffer[sb_hw], SFX_THREAD_FRAG_SIZE); LWP_ThreadSignal(sfx_queue); } static void * sfx_thread_func(void *arg) { Audio::MixerImpl *mixer = (Audio::MixerImpl *) arg; - u8 next_sb; + u8 sb_sw; while (true) { LWP_ThreadSleep(sfx_queue); @@ -54,11 +53,15 @@ static void * sfx_thread_func(void *arg) { if (sfx_thread_quit) break; - next_sb = sb ^ 1; - mixer->mixCallback(sound_buffer[next_sb], SFX_THREAD_FRAG_SIZE); - DCFlushRange(sound_buffer[next_sb], SFX_THREAD_FRAG_SIZE); - - sb = next_sb; + // the hardware uses two buffers: a front and a back buffer + // we use 3 buffers here: two are beeing pushed to the DSP, + // and the free one is where our mixer writes to + // thus the latency of our stream is: + // 8192 [frag size] / 48000 / 2 [16bit] / 2 [stereo] * 2 [hw buffers] + // -> 85.3ms + sb_sw = (sb_hw + 1) % SFX_BUFFERS; + mixer->mixCallback(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE); + DCFlushRange(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE); } return NULL; @@ -89,21 +92,20 @@ void OSystem_Wii::initSfx() { sfx_thread_running = true; } - sound_buffer[0] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE); - sound_buffer[1] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE); - - memset(sound_buffer[0], 0, SFX_THREAD_FRAG_SIZE); - memset(sound_buffer[1], 0, SFX_THREAD_FRAG_SIZE); - - DCFlushRange(sound_buffer[0], SFX_THREAD_FRAG_SIZE); - DCFlushRange(sound_buffer[1], SFX_THREAD_FRAG_SIZE); + for (u32 i = 0; i < SFX_BUFFERS; ++i) { + sound_buffer[i] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE); + memset(sound_buffer[i], 0, SFX_THREAD_FRAG_SIZE); + DCFlushRange(sound_buffer[i], SFX_THREAD_FRAG_SIZE); + } _mixer->setReady(true); + sb_hw = 0; + AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ); AUDIO_RegisterDMACallback(audio_switch_buffers); - - audio_switch_buffers(); + AUDIO_InitDMA((u32) sound_buffer[sb_hw], SFX_THREAD_FRAG_SIZE); + AUDIO_StartDMA(); } void OSystem_Wii::deinitSfx() { @@ -123,8 +125,8 @@ void OSystem_Wii::deinitSfx() { free(sfx_stack); sfx_thread_running = false; - free(sound_buffer[0]); - free(sound_buffer[1]); + for (u32 i = 0; i < SFX_BUFFERS; ++i) + free(sound_buffer[i]); } } |