From b728de788e4de24baaa720cea287a5707662e24f Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <[EMAIL REDACTED]>
Date: Sat, 11 Feb 2023 21:10:26 +0100
Subject: [PATCH] Fixed audio
---
src/audio/psp/SDL_pspaudio.c | 50 ++++++++++++++++++++++++------------
1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c
index f6cd0dcc5023..084d5c7e1a89 100644
--- a/src/audio/psp/SDL_pspaudio.c
+++ b/src/audio/psp/SDL_pspaudio.c
@@ -38,6 +38,11 @@
/* The tag name used by PSP audio */
#define PSPAUDIO_DRIVER_NAME "psp"
+static inline SDL_bool isBasicAudioConfig(const SDL_AudioSpec *spec)
+{
+ return spec->freq == 44100;
+}
+
static int PSPAUDIO_OpenDevice(_THIS, const char *devname)
{
int format, mixlen, i;
@@ -52,23 +57,37 @@ static int PSPAUDIO_OpenDevice(_THIS, const char *devname)
/* device only natively supports S16LSB */
this->spec.format = AUDIO_S16LSB;
- /* The sample count must be a multiple of 64. */
- this->spec.samples = PSP_AUDIO_SAMPLE_ALIGN(this->spec.samples);
-
- /* Setup the hardware channel. */
- if (this->spec.channels == 1) {
- format = PSP_AUDIO_FORMAT_MONO;
- } else {
- format = PSP_AUDIO_FORMAT_STEREO;
- this->spec.channels = 2; /* we're forcing the hardware to stereo. */
- }
-
/* PSP has some limitations with the Audio. It fully supports 44.1KHz (Mono & Stereo),
however with frequencies differents than 44.1KHz, it just supports Stereo,
so a resampler must be done for these scenarios */
- if (this->spec.freq == 44100) {
+ if (isBasicAudioConfig(&this->spec)) {
+ /* The sample count must be a multiple of 64. */
+ this->spec.samples = PSP_AUDIO_SAMPLE_ALIGN(this->spec.samples);
+ /* The number of channels (1 or 2). */
+ this->spec.channels = this->spec.channels == 1 ? 1 : 2;
+ format = this->spec.channels == 1 ? PSP_AUDIO_FORMAT_MONO : PSP_AUDIO_FORMAT_STEREO;
this->hidden->channel = sceAudioChReserve(PSP_AUDIO_NEXT_CHANNEL, this->spec.samples, format);
} else {
+ /* 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11050, 8000 */
+ switch (this->spec.freq) {
+ case 8000:
+ case 11025:
+ case 12000:
+ case 16000:
+ case 22050:
+ case 24000:
+ case 32000:
+ case 44100:
+ case 48000:
+ this->spec.freq = this->spec.freq;
+ break;
+ default:
+ this->spec.freq = 48000;
+ break;
+ }
+ /* The number of samples to output in one output call (min 17, max 4111). */
+ this->spec.samples = this->spec.samples < 17 ? 17 : (this->spec.samples > 4111 ? 4111 : this->spec.samples);
+ this->spec.channels = 2; /* we're forcing the hardware to stereo. */
this->hidden->channel = sceAudioSRCChReserve(this->spec.samples, this->spec.freq, 2);
}
@@ -101,12 +120,11 @@ static int PSPAUDIO_OpenDevice(_THIS, const char *devname)
static void PSPAUDIO_PlayDevice(_THIS)
{
- if (this->spec.freq != 44100) {
- Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer];
+ Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer];
+ if (!isBasicAudioConfig(&this->spec)) {
SDL_assert(this->spec.channels == 2);
sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, mixbuf);
} else {
- Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer];
sceAudioOutputPannedBlocking(this->hidden->channel, PSP_AUDIO_VOLUME_MAX, PSP_AUDIO_VOLUME_MAX, mixbuf);
}
@@ -127,7 +145,7 @@ static Uint8 *PSPAUDIO_GetDeviceBuf(_THIS)
static void PSPAUDIO_CloseDevice(_THIS)
{
if (this->hidden->channel >= 0) {
- if (this->spec.freq != 44100) {
+ if (!isBasicAudioConfig(&this->spec)) {
sceAudioSRCChRelease();
} else {
sceAudioChRelease(this->hidden->channel);