mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-09-19 19:07:48 +02:00
Henrik RydgårdandClaude Opus 5
fd72f308af
GetFreeChannel counted down with an unsigned loop variable, so i >= 0 was always true. With every channel already reserved it wrapped past zero and kept indexing g_audioChans until it walked off the end - sceAudioChReserve(-1, ...) segfaulted the emulator instead of returning "no channels available". Reproduces on audio/sceaudio/reserve, which crashed before printing anything. Also gives sceVaudioChReserve the parameter checks it never had. It took any sample count, channel count and frequency; the hardware allows 256, 1024 or 2048 samples, stereo only, and the same sample rates the SRC channel accepts. Every value in the test now matches - what's left there is only reschedule markers. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JvJR8oJNSCimCM9KXVLjfq
71 lines
1.9 KiB
C++
71 lines
1.9 KiB
C++
// Copyright (c) 2012- PPSSPP Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official git repository and contact information can be found at
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
#pragma once
|
|
|
|
#include <queue>
|
|
|
|
#include "CommonTypes.h"
|
|
#include "sceKernel.h"
|
|
|
|
class PointerWrap;
|
|
|
|
enum PspAudioFormats { PSP_AUDIO_FORMAT_STEREO = 0, PSP_AUDIO_FORMAT_MONO = 0x10 };
|
|
enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48000 };
|
|
|
|
const u32 PSP_AUDIO_CHANNEL_MAX = 8;
|
|
|
|
const int PSP_AUDIO_CHANNEL_SRC = 8;
|
|
const int PSP_AUDIO_CHANNEL_OUTPUT2 = 8;
|
|
const int PSP_AUDIO_CHANNEL_VAUDIO = 8;
|
|
|
|
struct AudioChannelWaitInfo {
|
|
SceUID threadID;
|
|
int numSamples;
|
|
};
|
|
|
|
struct AudioChannel {
|
|
int index = 0;
|
|
bool reserved = false;
|
|
|
|
// last sample address
|
|
u32 sampleAddress = 0;
|
|
u32 sampleCount = 0; // Number of samples written in each OutputBlocking
|
|
u32 leftVolume = 0;
|
|
u32 rightVolume = 0;
|
|
u32 format = 0;
|
|
|
|
// For the debugger only. Not saved.
|
|
bool mute = false;
|
|
|
|
std::vector<AudioChannelWaitInfo> waitingThreads;
|
|
|
|
void DoState(PointerWrap &p);
|
|
|
|
void reset();
|
|
void clear();
|
|
};
|
|
|
|
// The extra channel is for SRC/Output2/Vaudio (who all share, apparently.)
|
|
extern AudioChannel g_audioChans[PSP_AUDIO_CHANNEL_MAX + 1];
|
|
|
|
// The sample rates the SRC and VAUDIO channels will accept.
|
|
bool SRCFrequencyAllowed(int freq);
|
|
|
|
void Register_sceAudio();
|
|
|