Emulator-Archive/psOff_public
1
0
Fork 0
mirror of https://github.com/SysRay/psOff_public.git synced 2024-11-27 00:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #161 from igor725/ngs2fix

Browse Source 
Fix sampling rate for ngs2 sound
This commit is contained in:
SysRay 2024-05-20 20:04:42 +02:00 committed by GitHub
commit b2a41394b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/libSceNgs2/entry.cpp
View File

@ -248,7 +248,7 @@ EXPORT SYSV_ABI int32_t sceNgs2SystemCreateWithAllocator(const SceNgs2SystemOpti
return ret;
}
*outh = new (cbi.hostBuffer) SceNgs2Handle_system(alloc);
*outh = new (cbi.hostBuffer) SceNgs2Handle_system(alloc, sysopt ? sysopt->sampleRate : 48000);
getPimpl()->handles.emplace(*outh);
LOG_DEBUG(L"-> System: 0x%08llx", (uint64_t)*outh);
@ -263,8 +263,9 @@ EXPORT SYSV_ABI int32_t sceNgs2SystemCreate(const SceNgs2SystemOption* sysopt, c
if (sysopt != nullptr && sysopt->size < sizeof(SceNgs2SystemOption)) return Err::Ngs2::INVALID_OPTION_SIZE;
if (cbi == nullptr || cbi->hostBuffer == nullptr || cbi->hostBufferSize < sizeof(SceNgs2Handle)) return Err::Ngs2::INVALID_BUFFER_ADDRESS;
*outh = new (cbi->hostBuffer) SceNgs2Handle_system(nullptr);
getPimpl()->handles.emplace(*outh);
*outh = new (cbi->hostBuffer) SceNgs2Handle_system(nullptr, sysopt ? sysopt->sampleRate : 48000);
if (sysopt) getPimpl()->handles.emplace(*outh);
LOG_DEBUG(L"-> System: 0x%08llx", (uint64_t)*outh);
return (*outh) != nullptr ? Ok : Err::Ngs2::FAIL;
@ -581,7 +582,7 @@ EXPORT SYSV_ABI int32_t sceNgs2SystemRender(SceNgs2Handle* sysh, SceNgs2RenderBu
std::memset(rbi[i].bufferPtr, 0, rbi[i].bufferSize);
for (auto& voice: system->sampler->voices) {
if (voice.second.reader != nullptr) {
// voice.second.reader->getAudio(&rbi[i], numSamples);
// voice.second.reader->getAudio(&rbi[i], numSamples, system->outSampleRate);
}
}
}

3
modules/libSceNgs2/readFuncs.cpp
View File

@ -182,6 +182,7 @@ int32_t parseRiffWave(funcReadBuf_t readFunc, funcSeekBuf_t seekFunc, void* user
return Ok;
}
// Output channel layout for everything >2.0 seems to be invalid, we need to rearrange those
AVChannelLayout convChannelLayout(SceNgs2ChannelsCount count) {
LOG_USE_MODULE(libSceNgs2);
switch (count) {
@ -222,4 +223,4 @@ uint32_t getSampleBytes(SceNgs2WaveFormType type) {
default: break;
}
return 2;
}
}

12
modules/libSceNgs2/reader.cpp
View File

@ -229,7 +229,7 @@ void Reader::setNewData(void const* start, void const* end) {
voice->state.bits.Empty = false;
}
bool Reader::getAudioUncompressed(SceNgs2RenderBufferInfo* rbi, uint32_t numOutSamples) {
bool Reader::getAudioUncompressed(SceNgs2RenderBufferInfo* rbi, uint32_t numOutSamples, uint32_t outRate) {
LOG_USE_MODULE(libSceNgs2);
auto pimpl = (PImpl*)m_pimpl;
@ -249,8 +249,8 @@ bool Reader::getAudioUncompressed(SceNgs2RenderBufferInfo* rbi, uint32_t numOutS
auto const [formatIn, bytesIn] = convFormat(voice->info.type);
if (formatIn == AVSampleFormat::AV_SAMPLE_FMT_NONE) return false;
if (swr_alloc_set_opts2(&pimpl->swrCtx, &pimpl->curChannelLayoutOut, formatOut, voice->info.sampleRate, &pimpl->curChannelLayoutIn, formatIn,
voice->info.sampleRate, 0, NULL)) {
if (swr_alloc_set_opts2(&pimpl->swrCtx, &pimpl->curChannelLayoutOut, formatOut, outRate, &pimpl->curChannelLayoutIn, formatIn, voice->info.sampleRate, 0,
NULL)) {
LOG_ERR(L"Reader:Couldn't alloc swr");
return false;
}
@ -423,7 +423,7 @@ bool Reader::getAudioCompressed(SceNgs2RenderBufferInfo* rbi) {
return true;
}
bool Reader::getAudio(SceNgs2RenderBufferInfo* rbi, uint32_t numOutSamples) {
bool Reader::getAudio(SceNgs2RenderBufferInfo* rbi, uint32_t numOutSamples, uint32_t outRate) {
if (m_isInit == false || voice->state.bits.Empty || !voice->state.bits.Playing || (voice->state.bits.Playing && voice->state.bits.Paused)) {
return true;
}
@ -431,7 +431,7 @@ bool Reader::getAudio(SceNgs2RenderBufferInfo* rbi, uint32_t numOutSamples) {
if (m_isCompressed) {
return false; // getAudioCompressed(rbi);
} else {
return getAudioUncompressed(rbi, numOutSamples);
return getAudioUncompressed(rbi, numOutSamples, outRate);
}
return true;
}
}

4
modules/libSceNgs2/reader.h
View File

@ -11,7 +11,7 @@ class Reader {
SceNgs2SamplerVoiceState m_state;
bool getAudioUncompressed(SceNgs2RenderBufferInfo*, uint32_t numOutSamples);
bool getAudioUncompressed(SceNgs2RenderBufferInfo*, uint32_t numOutSamples, uint32_t outRate);
bool getAudioCompressed(SceNgs2RenderBufferInfo*);
public:
@ -20,7 +20,7 @@ class Reader {
bool init(SceNgs2SamplerVoiceWaveformBlocksParam const* param);
bool getAudio(SceNgs2RenderBufferInfo*, uint32_t numOutSamples);
bool getAudio(SceNgs2RenderBufferInfo*, uint32_t numOutSamples, uint32_t outRate);
void setNewData(void const* start, void const* end);

8
modules/libSceNgs2/types.h
View File

@ -232,8 +232,14 @@ struct SceNgs2Handle_system: public SceNgs2Handle {
// -
SceNgs2Handle_system(SceNgs2BufferAllocator const* alloc_): SceNgs2Handle(SceNgs2HandleType::System) {
// Options
uint32_t outSampleRate;
// -
SceNgs2Handle_system(SceNgs2BufferAllocator const* alloc_, uint32_t outrate): SceNgs2Handle(SceNgs2HandleType::System) {
if (alloc_ != nullptr) alloc = *alloc_;
outSampleRate = outrate;
}
virtual ~SceNgs2Handle_system() = default;