Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-04-25 07:52:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

audio/wiiu: FIx right audio channel

Browse Source 
The deinterleaving algorithm ended up overwriting the first half of the right channel buffer
This commit is contained in:
rw-r-r-0644 2019-10-17 18:48:51 +02:00
parent 7c235083d0
commit 26290a65a6
No known key found for this signature in database
GPG Key ID: 9F89C03279187405
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/audio/wiiu/SDL_wiiuaudio.c
View File

@ -141,6 +141,14 @@ static int WIIUAUDIO_OpenDevice(_THIS, void* handle, const char* devname, int is
DCStoreRange(this->hidden->mixbufs[i], this->spec.size);
}
/* Allocate a scratch buffer for deinterleaving operations */
this->hidden->deintvbuf = SDL_malloc(this->spec.size);
if (this->hidden->deintvbuf == NULL) {
AXQuit();
printf("DEBUG: Couldn't allocate deinterleave buffer");
return SDL_SetError("Couldn't allocate deinterleave buffer");
}
for (int i = 0; i < this->spec.channels; i++) {
/* Get a voice, top priority */
@ -298,40 +306,36 @@ static void WIIUAUDIO_PlayDevice(_THIS) {
/* Deinterleave stereo audio */
switch (SDL_AUDIO_BITSIZE(this->spec.format)) {
case 8: {
Uint8* samples = this->hidden->mixbufs[this->hidden->renderingid];
Uint8 r_samples[this->spec.samples];
/* Put all left samples into the first half of "samples" */
for (int i = 0; i < this->spec.samples; i++) {
samples[i] = samples[i*2];
r_samples[i] = samples[i*2+1];
Uint8* samples = (Uint8*)this->hidden->mixbufs[this->hidden->renderingid];
Uint8* deintv = (Uint8*)this->hidden->deintvbuf;
/* Store the samples in a separate deinterleaved buffer */
for (int ch = 0; ch < this->spec.channels; ch++) {
for (int i = 0; i < this->spec.samples; i++) {
deintv[this->spec.samples * ch + i] = samples[i * this->spec.channels + ch];
}
}
/* Copy right samples into the last half of "samples" */
memcpy(
&samples[this->spec.samples],
r_samples,
this->spec.samples * sizeof(samples[0])
);
} break;
case 16: {
Uint16* samples = (Uint16*)this->hidden->mixbufs[this->hidden->renderingid];
Uint16* deintv = (Uint16*)this->hidden->deintvbuf;
/* Store the samples in a separate deinterleaved buffer */
for (int ch = 0; ch < this->spec.channels; ch++) {
Uint16 sample_scratch[this->spec.samples];
for (int i = 0; i < this->spec.samples; i++) {
sample_scratch[i] = samples[i*this->spec.channels + ch];
deintv[this->spec.samples * ch + i] = samples[i * this->spec.channels + ch];
}
memcpy(
&samples[this->spec.samples * ch],
sample_scratch,
sizeof(sample_scratch)
);
}
} break;
default: {} break;
}
/* Copy the deinterleaved buffer to the mixing buffer */
memcpy(
this->hidden->mixbufs[this->hidden->renderingid],
this->hidden->deintvbuf,
this->spec.size
);
/* Comment this out for broken-record mode ;3 */
DCStoreRange(this->hidden->mixbufs[this->hidden->renderingid], this->spec.size);
/* Signal we're no longer rendering this buffer, AX callback will notice later */
@ -363,6 +367,7 @@ static void WIIUAUDIO_CloseDevice(_THIS) {
for (int i = 0; i < NUM_BUFFERS; i++) {
if (this->hidden->mixbufs[i]) SDL_free(this->hidden->mixbufs[i]);
}
if (this->hidden->deintvbuf) SDL_free(this->hidden->deintvbuf);
SDL_free(this->hidden);
}

2
src/audio/wiiu/SDL_wiiuaudio.h
View File

@ -40,6 +40,8 @@ struct SDL_PrivateAudioData {
Uint8 *rawbuf;
/* Individual mixing buffers. */
Uint8 *mixbufs[NUM_BUFFERS];
/* Deinterleaving buffer. */
Uint8 *deintvbuf;
int renderingid;
int playingid;