mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-24 14:00:03 +00:00
Implement sceAudioSRCChReserve/Release/OutputBlocking
This commit is contained in:
raven02
parent
6ca6fdd02a
commit
2a1e366d33
@ -28,6 +28,7 @@
|
||||
// We simply map it to the first of the 8 channels.
|
||||
|
||||
AudioChannel chans[8];
|
||||
int src;
|
||||
|
||||
// Enqueues the buffer pointer on the channel. If channel buffer queue is full (2 items?) will block until it isn't.
|
||||
// For solid audio output we'll need a queue length of 2 buffers at least, we'll try that first.
|
||||
@ -37,17 +38,16 @@ AudioChannel chans[8];
|
||||
|
||||
u32 sceAudioOutputBlocking(u32 chan, u32 vol, u32 samplePtr) {
|
||||
if (samplePtr == 0) {
|
||||
ERROR_LOG(HLE, "sceAudioOutputBlocking - Sample pointer null");
|
||||
ERROR_LOG(HLE, "sceAudioOutputBlocking() - Sample pointer null");
|
||||
return 0;
|
||||
}
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputBlocking() - BAD CHANNEL");
|
||||
} else if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputBlocking() - bad channel");
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputBlocking() - channel not reserved");
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioOutputBlocking(%d, %d, %08x )",chan,vol,samplePtr);
|
||||
DEBUG_LOG(HLE, "sceAudioOutputBlocking(%08x, %08x, %08x)", chan, vol, samplePtr);
|
||||
chans[chan].leftVolume = vol;
|
||||
chans[chan].rightVolume = vol;
|
||||
chans[chan].sampleAddress = samplePtr;
|
||||
@ -55,285 +55,262 @@ u32 sceAudioOutputBlocking(u32 chan, u32 vol, u32 samplePtr) {
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioOutputPannedBlocking(u32 chan, u32 volume1, u32 volume2, u32 samplePtr) {
|
||||
u32 sceAudioOutputPannedBlocking(u32 chan, u32 leftvol, u32 rightvol, u32 samplePtr) {
|
||||
if (samplePtr == 0) {
|
||||
ERROR_LOG(HLE, "sceAudioOutputPannedBlocking - Sample pointer null");
|
||||
ERROR_LOG(HLE, "sceAudioOutputPannedBlocking() - Sample pointer null");
|
||||
return 0;
|
||||
} else if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputPannedBlocking() - BAD CHANNEL");
|
||||
ERROR_LOG(HLE,"sceAudioOutputPannedBlocking() - bad channel");
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputPannedBlocking() - CHANNEL NOT RESERVED");
|
||||
ERROR_LOG(HLE,"sceAudioOutputPannedBlocking() - channel not reserved");
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioOutputPannedBlocking(%d,%d,%d, %08x )", chan, volume1, volume2, samplePtr);
|
||||
chans[chan].leftVolume = volume1;
|
||||
chans[chan].rightVolume = volume2;
|
||||
DEBUG_LOG(HLE, "sceAudioOutputPannedBlocking(%08x, %08x, %08x, %08x)", chan, leftvol, rightvol, samplePtr);
|
||||
chans[chan].leftVolume = leftvol;
|
||||
chans[chan].rightVolume = rightvol;
|
||||
chans[chan].sampleAddress = samplePtr;
|
||||
return __AudioEnqueue(chans[chan], chan, true);
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioOutput(u32 chan, u32 vol, u32 samplePtr)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutput() - BAD CHANNEL");
|
||||
u32 sceAudioOutput(u32 chan, u32 vol, u32 samplePtr) {
|
||||
if (samplePtr == 0) {
|
||||
ERROR_LOG(HLE, "sceAudioOutput() - Sample pointer null");
|
||||
return 0;
|
||||
} else if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutput() - bad channel");
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
else if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioOutput(%d, %d, %08x) - channel not reserved", chan, vol, samplePtr);
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioOutput(%08x, %08x, %08x) - channel not reserved", chan, vol, samplePtr);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioOutputPanned(%08x, %08x, %08x)", chan, vol, samplePtr);
|
||||
chans[chan].leftVolume = vol;
|
||||
chans[chan].rightVolume = vol;
|
||||
chans[chan].sampleAddress = samplePtr;
|
||||
u32 retval = __AudioEnqueue(chans[chan], chan, false);
|
||||
DEBUG_LOG(HLE, "%08x=sceAudioOutputPanned(%d, %d, %08x)", retval, chan, vol, samplePtr);
|
||||
return retval;
|
||||
return __AudioEnqueue(chans[chan], chan, false);
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioOutputPanned(u32 chan, u32 leftVol, u32 rightVol, u32 samplePtr)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioOutputPanned() - BAD CHANNEL");
|
||||
u32 sceAudioOutputPanned(u32 chan, u32 leftVol, u32 rightVol, u32 samplePtr) {
|
||||
if (samplePtr == 0) {
|
||||
ERROR_LOG(HLE, "sceAudioOutputPannedBlocking() - Sample pointer null");
|
||||
return 0;
|
||||
} else if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputPanned() - bad channel");
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
else if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioOutputPanned(%d, %d, %d, %08x) - channel not reserved", chan, leftVol, rightVol, samplePtr);
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioOutputPanned(%08x, %08x, %08x, %08x) - channel not reserved", chan, leftVol, rightVol, samplePtr);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
DEBUG_LOG(HLE,"sceAudioOutputPanned(%08x, %08x, %08x, %08x)", chan, leftVol, rightVol, samplePtr);
|
||||
chans[chan].leftVolume = leftVol;
|
||||
chans[chan].rightVolume = rightVol;
|
||||
chans[chan].sampleAddress = samplePtr;
|
||||
u32 retval = __AudioEnqueue(chans[chan], chan, false);
|
||||
DEBUG_LOG(HLE, "%08x=sceAudioOutputPanned(%d, %d, %d, %08x)", retval, chan, leftVol, rightVol, samplePtr);
|
||||
return retval;
|
||||
return __AudioEnqueue(chans[chan], chan, false);
|
||||
}
|
||||
}
|
||||
|
||||
int sceAudioGetChannelRestLen(u32 chan)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE, "sceAudioGetChannelRestLen(%i) - BAD CHANNEL", chan);
|
||||
int sceAudioGetChannelRestLen(u32 chan) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE, "sceAudioGetChannelRestLen(%08x) - bad channel", chan);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
|
||||
int sz = (int)chans[chan].sampleQueue.size() / 2;
|
||||
DEBUG_LOG(HLE,"UNTESTED %i = sceAudioGetChannelRestLen(%i)", sz, chan);
|
||||
return sz;
|
||||
DEBUG_LOG(HLE,"sceAudioGetChannelRestLen(%08x)", chan);
|
||||
return (int)chans[chan].sampleQueue.size() / 2;
|
||||
}
|
||||
|
||||
int sceAudioGetChannelRestLength(u32 chan)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE, "sceAudioGetChannelRestLength(%i) - BAD CHANNEL", chan);
|
||||
int sceAudioGetChannelRestLength(u32 chan) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE, "sceAudioGetChannelRestLength(%08x) - bad channel", chan);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
|
||||
int sz = (int)chans[chan].sampleQueue.size() / 2;
|
||||
DEBUG_LOG(HLE,"UNTESTED %i = sceAudioGetChannelRestLen(%i)", sz, chan);
|
||||
return sz;
|
||||
DEBUG_LOG(HLE,"sceAudioGetChannelRestLength(%08x)", chan);
|
||||
return (int)chans[chan].sampleQueue.size() / 2;
|
||||
}
|
||||
|
||||
static int GetFreeChannel()
|
||||
{
|
||||
static int GetFreeChannel() {
|
||||
for (int i = 0; i < PSP_AUDIO_CHANNEL_MAX ; i++)
|
||||
if (!chans[i].reserved)
|
||||
return i;
|
||||
return -1;
|
||||
}
|
||||
|
||||
u32 sceAudioChReserve(u32 channel, u32 sampleCount, u32 format) //.Allocate sound channel
|
||||
{
|
||||
if (channel == (u32)-1)
|
||||
{
|
||||
channel = GetFreeChannel();
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChReserve failed");
|
||||
u32 sceAudioChReserve(u32 chan, u32 sampleCount, u32 format) {
|
||||
if (chan == (u32)-1) {
|
||||
chan = GetFreeChannel();
|
||||
} else {
|
||||
ERROR_LOG(HLE,"sceAudioChReserve - reserve channel failed");
|
||||
return SCE_ERROR_AUDIO_NO_CHANNELS_AVAILABLE;
|
||||
}
|
||||
|
||||
if (channel >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE ,"sceAudioChReserve(channel = %d, sampleCount = %d, format = %d) - BAD CHANNEL", channel, sampleCount, format);
|
||||
}
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE ,"sceAudioChReserve(%08x, %08x, %08x) - bad channel", chan, sampleCount, format);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
|
||||
if (format != PSP_AUDIO_FORMAT_MONO && format != PSP_AUDIO_FORMAT_STEREO)
|
||||
{
|
||||
ERROR_LOG(HLE, "sceAudioChReserve(channel = %d, sampleCount = %d, format = %d): invalid format", channel, sampleCount, format);
|
||||
if (format != PSP_AUDIO_FORMAT_MONO && format != PSP_AUDIO_FORMAT_STEREO) {
|
||||
ERROR_LOG(HLE, "sceAudioChReserve(%08x, %08x, %08x) - invalid format", chan, sampleCount, format);
|
||||
return SCE_ERROR_AUDIO_INVALID_FORMAT;
|
||||
}
|
||||
|
||||
if (chans[channel].reserved)
|
||||
{
|
||||
WARN_LOG(HLE, "WARNING: Reserving already reserved channel. Error?");
|
||||
if (chans[chan].reserved) {
|
||||
WARN_LOG(HLE, "WARNING: Reserving already reserved channel.");
|
||||
}
|
||||
DEBUG_LOG(HLE, "sceAudioChReserve(channel = %d, sampleCount = %d, format = %d)", channel, sampleCount, format);
|
||||
|
||||
chans[channel].sampleCount = sampleCount;
|
||||
chans[channel].reserved = true;
|
||||
return channel; //return handle
|
||||
DEBUG_LOG(HLE, "sceAudioChReserve(%08x, %08x, %08x)", chan, sampleCount, format);
|
||||
chans[chan].sampleCount = sampleCount;
|
||||
chans[chan].reserved = true;
|
||||
return chan;
|
||||
}
|
||||
|
||||
u32 sceAudioChRelease(u32 chan)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE, "sceAudioChRelease(%i) - BAD CHANNEL", chan);
|
||||
u32 sceAudioChRelease(u32 chan) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE, "sceAudioChRelease(%i) - bad channel", chan);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
|
||||
if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChRelease(%i): channel not reserved", chan);
|
||||
if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioChRelease(%i) - channel not reserved", chan);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
chans[chan].reserved = false;
|
||||
|
||||
DEBUG_LOG(HLE, "sceAudioChRelease(%i)", chan);
|
||||
chans[chan].reserved = false;
|
||||
return 1;
|
||||
}
|
||||
|
||||
u32 sceAudioSetChannelDataLen(u32 chan, u32 len)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioSetChannelDataLen(%i, %i) - BAD CHANNEL", chan, len);
|
||||
u32 sceAudioSetChannelDataLen(u32 chan, u32 len) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioSetChannelDataLen(%08x, %08x) - bad channel", chan, len);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
else if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioSetChannelDataLen(%i, %i) - channel not reserved", chan, len);
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioSetChannelDataLen(%08x, %08x) - channel not reserved", chan, len);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(HLE, "sceAudioSetChannelDataLen(%i, %i)", chan, len);
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioSetChannelDataLen(%08x, %08x)", chan, len);
|
||||
chans[chan].sampleCount = len;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioChangeChannelConfig(u32 chan, u32 format)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelConfig(%i, %i) - invalid channel number", chan, format);
|
||||
u32 sceAudioChangeChannelConfig(u32 chan, u32 format) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelConfig(%08x, %08x) - invalid channel number", chan, format);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
else if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelConfig(%i, %i) - channel not reserved", chan, format);
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelConfig(%08x, %08x) - channel not reserved", chan, format);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(HLE, "sceAudioChangeChannelConfig(%i, %i)", chan, format);
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioChangeChannelConfig(%08x, %08x)", chan, format);
|
||||
chans[chan].format = format;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioChangeChannelVolume(u32 chan, u32 lvolume, u32 rvolume)
|
||||
{
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelVolume(%i, %i, %i) - invalid channel number", chan, lvolume, rvolume);
|
||||
u32 sceAudioChangeChannelVolume(u32 chan, u32 leftvol, u32 rightvol) {
|
||||
if (chan >= PSP_AUDIO_CHANNEL_MAX) {
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelVolume(%08x, %08x, %08x) - invalid channel number", chan, leftvol, rightvol);
|
||||
return SCE_ERROR_AUDIO_INVALID_CHANNEL;
|
||||
}
|
||||
else if (!chans[chan].reserved)
|
||||
{
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelVolume(%i, %i, %i) - channel not reserved", chan, lvolume, rvolume);
|
||||
} else if (!chans[chan].reserved) {
|
||||
ERROR_LOG(HLE,"sceAudioChangeChannelVolume(%08x, %08x, %08x) - channel not reserved", chan, leftvol, rightvol);
|
||||
return SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(HLE, "sceAudioChangeChannelVolume(%i, %i, %i)", chan, lvolume, rvolume);
|
||||
chans[chan].leftVolume = lvolume;
|
||||
chans[chan].rightVolume = rvolume;
|
||||
} else {
|
||||
DEBUG_LOG(HLE, "sceAudioChangeChannelVolume(%08x, %08x, %08x)", chan, leftvol, rightvol);
|
||||
chans[chan].leftVolume = leftvol;
|
||||
chans[chan].rightVolume = rightvol;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioInit()
|
||||
{
|
||||
u32 sceAudioInit(){
|
||||
DEBUG_LOG(HLE,"sceAudioInit()");
|
||||
// Don't need to do anything
|
||||
return 0;
|
||||
}
|
||||
u32 sceAudioEnd()
|
||||
{
|
||||
|
||||
u32 sceAudioEnd(){
|
||||
DEBUG_LOG(HLE,"sceAudioEnd()");
|
||||
// Don't need to do anything
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioOutput2Reserve(u32 sampleCount)
|
||||
{
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2Reserve(%i)", sampleCount);
|
||||
chans[0].sampleCount = sampleCount;
|
||||
chans[0].reserved = true;
|
||||
u32 sceAudioOutput2Reserve(u32 sampleCount){
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2Reserve(%08x)", sampleCount);
|
||||
if (!chans[src].reserved) {
|
||||
chans[0].sampleCount = sampleCount;
|
||||
chans[0].reserved = true;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioOutput2OutputBlocking(u32 vol, u32 dataPtr)
|
||||
{
|
||||
DEBUG_LOG(HLE,"FAKE sceAudioOutput2OutputBlocking(%i, %08x)", vol, dataPtr);
|
||||
u32 sceAudioOutput2OutputBlocking(u32 vol, u32 dataPtr){
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2OutputBlocking(%08x, %08x)", vol, dataPtr);
|
||||
chans[0].leftVolume = vol;
|
||||
chans[0].rightVolume = vol;
|
||||
chans[0].sampleAddress = dataPtr;
|
||||
return __AudioEnqueue(chans[0], 0, true);
|
||||
}
|
||||
|
||||
u32 sceAudioOutput2ChangeLength(u32 sampleCount)
|
||||
{
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2ChangeLength(%i)", sampleCount);
|
||||
u32 sceAudioOutput2ChangeLength(u32 sampleCount){
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2ChangeLength(%08x)", sampleCount);
|
||||
chans[0].sampleCount = sampleCount;
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioOutput2GetRestSample()
|
||||
{
|
||||
DEBUG_LOG(HLE,"UNTESTED sceAudioOutput2GetRestSample()");
|
||||
u32 sceAudioOutput2GetRestSample(){
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2GetRestSample()");
|
||||
return (u32) chans[0].sampleQueue.size() * 2;
|
||||
}
|
||||
|
||||
u32 sceAudioOutput2Release()
|
||||
{
|
||||
u32 sceAudioOutput2Release(){
|
||||
DEBUG_LOG(HLE,"sceAudioOutput2Release()");
|
||||
chans[0].reserved = false;
|
||||
if (!chans[0].reserved) {
|
||||
chans[0].reserved = false;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioSetFrequency(u32 freq) {
|
||||
if (freq == 44100 || freq == 48000) {
|
||||
INFO_LOG(HLE, "sceAudioSetFrequency(%i)", freq);
|
||||
INFO_LOG(HLE, "sceAudioSetFrequency(%08x)", freq);
|
||||
__AudioSetOutputFrequency(freq);
|
||||
return 0;
|
||||
} else {
|
||||
ERROR_LOG(HLE, "sceAudioSetFrequency(%i) - invalid frequency (must be 44.1 or 48 khz)", freq);
|
||||
ERROR_LOG(HLE, "sceAudioSetFrequency(%08x) - invalid frequency (must be 44.1 or 48 khz)", freq);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
u32 sceAudioSetVolumeOffset(u32 unknown) {
|
||||
ERROR_LOG(HLE, "UNIMPL sceAudioSetVolumeOffset(%i)", unknown);
|
||||
u32 sceAudioSetVolumeOffset() {
|
||||
ERROR_LOG(HLE, "UNIMPL sceAudioSetVolumeOffset()");
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioSRCChReserve(u32 sampleCount, u32 freq, u32 format) {
|
||||
DEBUG_LOG(HLE, "sceAudioSRCChReserve(%08x, %08x, %08x)", sampleCount, freq, format);
|
||||
if (!chans[src].reserved) {
|
||||
chans[src].reserved = true;
|
||||
chans[src].sampleCount = sampleCount;
|
||||
chans[src].format = format;
|
||||
__AudioSetOutputFrequency(freq);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioSRCChRelease() {
|
||||
DEBUG_LOG(HLE, "sceAudioSRCChRelease()");
|
||||
if (!chans[src].reserved) {
|
||||
chans[src].reserved = false;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 sceAudioSRCOutputBlocking(u32 vol, u32 buf) {
|
||||
DEBUG_LOG(HLE, "sceAudioSRCOutputBlocking(%08x, %08x)", vol, buf);
|
||||
chans[src].leftVolume = vol;
|
||||
chans[src].rightVolume = vol;
|
||||
chans[src].sampleAddress = buf;
|
||||
return __AudioEnqueue(chans[src], src, true);
|
||||
}
|
||||
|
||||
const HLEFunction sceAudio[] =
|
||||
{
|
||||
// Newer simplified single channel audio output. Presumably for games that use Atrac3
|
||||
@ -343,30 +320,24 @@ const HLEFunction sceAudio[] =
|
||||
{0x63f2889c, WrapU_U<sceAudioOutput2ChangeLength>, "sceAudioOutput2ChangeLength"},
|
||||
{0x647cef33, WrapU_V<sceAudioOutput2GetRestSample>, "sceAudioOutput2GetRestSample"},
|
||||
{0x43196845, WrapU_V<sceAudioOutput2Release>, "sceAudioOutput2Release"},
|
||||
|
||||
{0x80F1F7E0, WrapU_V<sceAudioInit>, "sceAudioInit"},
|
||||
{0x210567F7, WrapU_V<sceAudioEnd>, "sceAudioEnd"},
|
||||
|
||||
{0xA2BEAA6C, WrapU_U<sceAudioSetFrequency>, "sceAudioSetFrequency"},
|
||||
{0x927AC32B, WrapU_U<sceAudioSetVolumeOffset>, "sceAudioSetVolumeOffset"},
|
||||
|
||||
// The oldest and standard audio interface. Supports 8 channels, most games use 1-2.
|
||||
{0x927AC32B, WrapU_V<sceAudioSetVolumeOffset>, "sceAudioSetVolumeOffset"},
|
||||
{0x8c1009b2, WrapU_UUU<sceAudioOutput>, "sceAudioOutput"},
|
||||
{0x136CAF51, WrapU_UUU<sceAudioOutputBlocking>, "sceAudioOutputBlocking"},
|
||||
{0xE2D56B2D, WrapU_UUUU<sceAudioOutputPanned>, "sceAudioOutputPanned"},
|
||||
{0x13F592BC, WrapU_UUUU<sceAudioOutputPannedBlocking>, "sceAudioOutputPannedBlocking"}, //(u32, u32, u32, void *)Output sound, blocking
|
||||
{0x5EC81C55, WrapU_UUU<sceAudioChReserve>, "sceAudioChReserve"}, //(u32, u32 samplecount, u32) Initialize channel and allocate buffer long, long samplecount, long);//init buffer? returns handle, minus if error
|
||||
{0x6FC46853, WrapU_U<sceAudioChRelease>, "sceAudioChRelease"}, //(long handle)Terminate channel and deallocate buffer //free buffer?
|
||||
{0x13F592BC, WrapU_UUUU<sceAudioOutputPannedBlocking>, "sceAudioOutputPannedBlocking"},
|
||||
{0x5EC81C55, WrapU_UUU<sceAudioChReserve>, "sceAudioChReserve"},
|
||||
{0x6FC46853, WrapU_U<sceAudioChRelease>, "sceAudioChRelease"},
|
||||
{0xE9D97901, WrapI_U<sceAudioGetChannelRestLen>, "sceAudioGetChannelRestLen"},
|
||||
{0xB011922F, WrapI_U<sceAudioGetChannelRestLen>, "sceAudioGetChannelRestLength"}, // Is there a difference between this and sceAudioGetChannelRestLen?
|
||||
{0xCB2E439E, WrapU_UU<sceAudioSetChannelDataLen>, "sceAudioSetChannelDataLen"}, //(u32, u32)
|
||||
{0xB011922F, WrapI_U<sceAudioGetChannelRestLen>, "sceAudioGetChannelRestLength"},
|
||||
{0xCB2E439E, WrapU_UU<sceAudioSetChannelDataLen>, "sceAudioSetChannelDataLen"},
|
||||
{0x95FD0C2D, WrapU_UU<sceAudioChangeChannelConfig>, "sceAudioChangeChannelConfig"},
|
||||
{0xB7E1D8E7, WrapU_UUU<sceAudioChangeChannelVolume>, "sceAudioChangeChannelVolume"},
|
||||
|
||||
// I guess these are like the others but do sample rate conversion?
|
||||
{0x38553111, 0, "sceAudioSRCChReserve"},
|
||||
{0x5C37C0AE, 0, "sceAudioSRCChRelease"},
|
||||
{0xE0727056, 0, "sceAudioSRCOutputBlocking"},
|
||||
{0x38553111, WrapU_UUU<sceAudioSRCChReserve>, "sceAudioSRCChReserve"},
|
||||
{0x5C37C0AE, WrapU_V<sceAudioSRCChRelease>, "sceAudioSRCChRelease"},
|
||||
{0xE0727056, WrapU_UU<sceAudioSRCOutputBlocking>, "sceAudioSRCOutputBlocking"},
|
||||
|
||||
// Never seen these used
|
||||
{0x41efade7, 0, "sceAudioOneshotOutput"},
|
||||
@ -382,8 +353,6 @@ const HLEFunction sceAudio[] =
|
||||
{0x87b2e651, 0, "sceAudioWaitInputEnd"},
|
||||
};
|
||||
|
||||
|
||||
|
||||
void Register_sceAudio()
|
||||
{
|
||||
RegisterModule("sceAudio", ARRAY_SIZE(sceAudio), sceAudio);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user