thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: If we get an audio device with a different freq than 44100, that's actually OK.

Browse source
This commit is contained in:
Henrik Rydgård 2020-05-16 21:15:51 +02:00
parent 9e5be91bfa
commit 06c22497b7
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SDL/SDLMain.cpp
View file

@ -84,8 +84,8 @@ int getDisplayNumber(void) {
return displayNumber;
}
extern void mixaudio(void *userdata, Uint8 *stream, int len) {
NativeMix((short *)stream, len / 4);
void sdl_mixaudio_callback(void *userdata, Uint8 *stream, int len) {
NativeMix((short *)stream, len / (2 * 2));
}
static SDL_AudioDeviceID audioDev = 0;
@ -98,7 +98,7 @@ static void InitSDLAudioDevice(const std::string &name = "") {
fmt.format = AUDIO_S16;
fmt.channels = 2;
fmt.samples = 2048;
fmt.callback = &mixaudio;
fmt.callback = &sdl_mixaudio_callback;
fmt.userdata = nullptr;
std::string startDevice = name;
@ -122,7 +122,7 @@ static void InitSDLAudioDevice(const std::string &name = "") {
} else {
if (g_retFmt.samples != fmt.samples) // Notify, but still use it
ELOG("Output audio samples: %d (requested: %d)", g_retFmt.samples, fmt.samples);
if (g_retFmt.freq != fmt.freq || g_retFmt.format != fmt.format || g_retFmt.channels != fmt.channels) {
if (g_retFmt.format != fmt.format || g_retFmt.channels != fmt.channels) {
ELOG("Sound buffer format does not match requested format.");
ELOG("Output audio freq: %d (requested: %d)", g_retFmt.freq, fmt.freq);
ELOG("Output audio format: %d (requested: %d)", g_retFmt.format, fmt.format);