iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Work with SDL as subtree

Browse Source
This commit is contained in:
SimoneN64
2024-09-04 23:11:10 +02:00
parent 7435b8d527
commit 2f466dae11
8 changed files with 78 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/backend/core/mmio/Audio.cpp
View File

@@ -1,22 +1,23 @@
#include <Audio.hpp>
#include <SDL2/SDL.h>
#include <SDL3/SDL_audio.h>
#include <SDL3/SDL_init.h>
#include <log.hpp>
namespace n64 {
#define AUDIO_SAMPLE_RATE 44100
#define SYSTEM_SAMPLE_FORMAT AUDIO_F32SYS
#define SYSTEM_SAMPLE_FORMAT SDL_AUDIO_F32
#define SYSTEM_SAMPLE_SIZE 4
#define BYTES_PER_HALF_SECOND (((float)AUDIO_SAMPLE_RATE / 2) * SYSTEM_SAMPLE_SIZE)
void audioCallback(void *user, Uint8 *stream, int length) {
auto audioDevice = (AudioDevice *)user;
void audioCallback(void *userdata, SDL_AudioStream *stream, int additional_amount, int total_amount) {
auto audioDevice = (AudioDevice *)userdata;
int gotten = 0, available = 0;
if (audioDevice) {
audioDevice->LockMutex();
available = SDL_AudioStreamAvailable(audioDevice->GetStream());
available = SDL_GetAudioStreamAvailable(audioDevice->GetStream());
if (available > 0) {
gotten = SDL_AudioStreamGet(audioDevice->GetStream(), stream, length);
gotten = SDL_GetAudioStreamData(audioDevice->GetStream(), stream, total_amount);
}
audioDevice->UnlockMutex();
}
@@ -25,7 +26,7 @@ void audioCallback(void *user, Uint8 *stream, int length) {
auto *out = (float *)stream;
out += gottenSamples;
for (int i = gottenSamples; i < length / sizeof(float); i++) {
for (int i = gottenSamples; i < total_amount / sizeof(float); i++) {
float sample = 0;
*out++ = sample;
}
@@ -33,35 +34,33 @@ void audioCallback(void *user, Uint8 *stream, int length) {
AudioDevice::~AudioDevice() {
LockMutex();
SDL_FreeAudioStream(GetStream());
SDL_DestroyAudioStream(GetStream());
UnlockMutex();
SDL_DestroyMutex(audioStreamMutex);
}
AudioDevice::AudioDevice() :
audioStream(
SDL_NewAudioStream(SYSTEM_SAMPLE_FORMAT, 2, AUDIO_SAMPLE_RATE, SYSTEM_SAMPLE_FORMAT, 2, AUDIO_SAMPLE_RATE)),
audioStreamMutex(SDL_CreateMutex()) {
AudioDevice::AudioDevice() : audioStreamMutex(SDL_CreateMutex()) {
request.freq = AUDIO_SAMPLE_RATE;
request.format = SYSTEM_SAMPLE_FORMAT;
request.channels = 2;
audioStream = SDL_CreateAudioStream(&request, &request);
SDL_InitSubSystem(SDL_INIT_AUDIO);
if (!audioStreamMutex) {
Util::panic("Unable to initialize audio mutex: {}", SDL_GetError());
}
request.freq = AUDIO_SAMPLE_RATE;
request.format = SYSTEM_SAMPLE_FORMAT;
request.channels = 2;
request.samples = 1024;
request.callback = audioCallback;
request.userdata = (void *)this;
handle = SDL_OpenAudioDevice(nullptr, 0, &request, &audioSpec, 0);
handle = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &request);
SDL_BindAudioStream(handle, audioStream);
SDL_SetAudioStreamGetCallback(audioStream, audioCallback, this);
if (!handle) {
Util::panic("Failed to initialize SDL Audio: {}", SDL_GetError());
}
SDL_PauseAudioDevice(handle, false);
SDL_PauseAudioDevice(handle);
}
void AudioDevice::PushSample(float left, float volumeL, float right, float volumeR) {
@@ -69,16 +68,23 @@ void AudioDevice::PushSample(float left, float volumeL, float right, float volum
float adjustedR = right * volumeR;
float samples[2]{adjustedL, adjustedR};
auto availableBytes = (float)SDL_AudioStreamAvailable(audioStream);
auto availableBytes = (float)SDL_GetAudioStreamAvailable(audioStream);
if (availableBytes <= BYTES_PER_HALF_SECOND) {
SDL_AudioStreamPut(audioStream, samples, 2 * sizeof(float));
SDL_PutAudioStreamData(audioStream, samples, 2 * sizeof(float));
}
}
void AudioDevice::AdjustSampleRate(int sampleRate) {
LockMutex();
SDL_FreeAudioStream(audioStream);
audioStream = SDL_NewAudioStream(SYSTEM_SAMPLE_FORMAT, 2, sampleRate, SYSTEM_SAMPLE_FORMAT, 2, AUDIO_SAMPLE_RATE);
SDL_DestroyAudioStream(audioStream);
auto oldReq = request;
request.freq = sampleRate;
request.format = SYSTEM_SAMPLE_FORMAT;
request.channels = 2;
audioStream = SDL_CreateAudioStream(&request, &oldReq);
UnlockMutex();
}
} // namespace n64

4
src/backend/core/mmio/Audio.hpp
View File

@@ -1,6 +1,6 @@
#pragma once
#include <MemoryHelpers.hpp>
#include <SDL2/SDL_audio.h>
#include <SDL3/SDL_audio.h>
namespace n64 {
struct AudioDevice {
@@ -22,7 +22,7 @@ struct AudioDevice {
private:
SDL_AudioStream *audioStream;
SDL_mutex *audioStreamMutex;
SDL_Mutex *audioStreamMutex;
SDL_AudioSpec audioSpec{};
SDL_AudioSpec request{};
SDL_AudioDeviceID handle{};

5
src/backend/core/mmio/CMakeLists.txt
View File

@@ -1,7 +1,4 @@
file(GLOB_RECURSE SOURCES *.cpp)
file(GLOB_RECURSE HEADERS *.hpp)
find_package(SDL2 CONFIG REQUIRED)
add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp)
target_link_libraries(mmio PRIVATE SDL2::SDL2)
add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp)

10
src/backend/core/registers/cop/cop1instructions.cpp
View File

@@ -144,7 +144,7 @@ bool Cop1::isqnan<double>(double f) {
template <>
bool Cop1::CheckCVTArg<s32>(float &f) {
switch (fpclassify(f)) {
switch (std::fpclassify(f)) {
case FP_SUBNORMAL:
case FP_INFINITE:
case FP_NAN:
@@ -164,7 +164,7 @@ bool Cop1::CheckCVTArg<s32>(float &f) {
template <>
bool Cop1::CheckCVTArg<s32>(double &f) {
switch (fpclassify(f)) {
switch (std::fpclassify(f)) {
case FP_SUBNORMAL:
case FP_INFINITE:
case FP_NAN:
@@ -184,7 +184,7 @@ bool Cop1::CheckCVTArg<s32>(double &f) {
template <>
bool Cop1::CheckCVTArg<s64>(float &f) {
switch (fpclassify(f)) {
switch (std::fpclassify(f)) {
case FP_SUBNORMAL:
case FP_INFINITE:
case FP_NAN:
@@ -204,7 +204,7 @@ bool Cop1::CheckCVTArg<s64>(float &f) {
template <>
bool Cop1::CheckCVTArg<s64>(double &f) {
switch (fpclassify(f)) {
switch (std::fpclassify(f)) {
case FP_SUBNORMAL:
case FP_INFINITE:
case FP_NAN:
@@ -224,7 +224,7 @@ bool Cop1::CheckCVTArg<s64>(double &f) {
template <typename T>
bool Cop1::CheckArg(T &f) {
switch (fpclassify(f)) {
switch (std::fpclassify(f)) {
case FP_SUBNORMAL:
SetCauseUnimplemented();
regs.cop0.FireException(ExceptionCode::FloatingPointError, 0, regs.oldPC);