Merge pull request #642 from wheremyfoodat/more-dsp

Better audio playback code

include/PICA/pica_vertex.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include "PICA/float_types.hpp"
 #include <array>
 
+#include "PICA/float_types.hpp"
+
 namespace PICA {
 	// A representation of the output vertex as it comes out of the vertex shader, with padding and all
 	struct Vertex {

include/audio/dsp_core.hpp

@@ -8,8 +8,8 @@
 
 #include "helpers.hpp"
 #include "logger.hpp"
-#include "scheduler.hpp"
 #include "ring_buffer.hpp"
+#include "scheduler.hpp"
 
 // The DSP core must have access to the DSP service to be able to trigger interrupts properly
 class DSPService;
@@ -24,7 +24,8 @@ namespace Audio {
 	static constexpr u64 lleSlice = 16384;
 
 	class DSPCore {
-		using Samples = Common::RingBuffer<s16, 1024>;
+		// 0x2000 stereo (= 2 channel) samples
+		using Samples = Common::RingBuffer<s16, 0x2000 * 2>;
 
 	  protected:
 		Memory& mem;
@@ -38,8 +39,7 @@ namespace Audio {
 
 	  public:
 		enum class Type { Null, Teakra, HLE };
-		DSPCore(Memory& mem, Scheduler& scheduler, DSPService& dspService)
+		DSPCore(Memory& mem, Scheduler& scheduler, DSPService& dspService) : mem(mem), scheduler(scheduler), dspService(dspService) {}
-			: mem(mem), scheduler(scheduler), dspService(dspService) {}
 		virtual ~DSPCore() {}
 
 		virtual void reset() = 0;

include/audio/miniaudio_device.hpp

@@ -3,11 +3,12 @@
 #include <string>
 #include <vector>
 
+#include "helpers.hpp"
 #include "miniaudio.h"
 #include "ring_buffer.hpp"
 
 class MiniAudioDevice {
-	using Samples = Common::RingBuffer<ma_int16, 1024>;
+	using Samples = Common::RingBuffer<ma_int16, 0x2000 * 2>;
 	static constexpr ma_uint32 sampleRate = 32768;  // 3DS sample rate
 	static constexpr ma_uint32 channelCount = 2;    // Audio output is stereo
 
@@ -20,6 +21,8 @@ class MiniAudioDevice {
 	bool initialized = false;
 	bool running = false;
 
+	// Store the last stereo sample we output. We play this when underruning to avoid pops.
+	std::array<s16, 2> lastStereoSample;
 	std::vector<std::string> audioDevices;
 
   public:

include/audio/null_core.hpp

@@ -20,7 +20,7 @@ namespace Audio {
 		std::array<u8, Memory::DSP_RAM_SIZE> dspRam;
 
 		void resetAudioPipe();
-		bool loaded = false; // Have we loaded a component?
+		bool loaded = false;  // Have we loaded a component?
 
 	  public:
 		NullDSP(Memory& mem, Scheduler& scheduler, DSPService& dspService) : DSPCore(mem, scheduler, dspService) {}

include/renderdoc.hpp

@@ -59,7 +59,7 @@ namespace Renderdoc {
 		}
 
 		~InstantScope() { Renderdoc::endCapture(); }
-		
+
 		InstantScope(const InstantScope&) = delete;
 		InstantScope& operator=(const InstantScope&) = delete;
 

include/services/region_codes.hpp

@@ -9,7 +9,7 @@ enum class Regions : u32 {
 	Australia = 3,
 	China = 4,
 	Korea = 5,
-	Taiwan = 6
+	Taiwan = 6,
 };
 
 // Used for the language field in the NAND user data
@@ -42,137 +42,137 @@ enum class LanguageCodes : u32 {
 };
 
 enum class CountryCodes : u32 {
-    JP = 1,
+	JP = 1,
-    AI = 8,
+	AI = 8,
-    AG = 9,
+	AG = 9,
-    AR = 10,
+	AR = 10,
-    AW = 11,
+	AW = 11,
-    BS = 12,
+	BS = 12,
-    BB = 13,
+	BB = 13,
-    BZ = 14,
+	BZ = 14,
-    BO = 15,
+	BO = 15,
-    BR = 16,
+	BR = 16,
-    VG = 17,
+	VG = 17,
-    CA = 18,
+	CA = 18,
-    KY = 19,
+	KY = 19,
-    CL = 20,
+	CL = 20,
-    CO = 21,
+	CO = 21,
-    CR = 22,
+	CR = 22,
-    DM = 23,
+	DM = 23,
-    DO = 24,
+	DO = 24,
-    EC = 25,
+	EC = 25,
-    SV = 26,
+	SV = 26,
-    GF = 27,
+	GF = 27,
-    GD = 28,
+	GD = 28,
-    GP = 29,
+	GP = 29,
-    GT = 30,
+	GT = 30,
-    GY = 31,
+	GY = 31,
-    HT = 32,
+	HT = 32,
-    HN = 33,
+	HN = 33,
-    JM = 34,
+	JM = 34,
-    MQ = 35,
+	MQ = 35,
-    MX = 36,
+	MX = 36,
-    MS = 37,
+	MS = 37,
-    AN = 38,
+	AN = 38,
-    NI = 39,
+	NI = 39,
-    PA = 40,
+	PA = 40,
-    PY = 41,
+	PY = 41,
-    PE = 42,
+	PE = 42,
-    KN = 43,
+	KN = 43,
-    LC = 44,
+	LC = 44,
-    VC = 45,
+	VC = 45,
-    SR = 46,
+	SR = 46,
-    TT = 47,
+	TT = 47,
-    TC = 48,
+	TC = 48,
-    US = 49,
+	US = 49,
-    UY = 50,
+	UY = 50,
-    VI = 51,
+	VI = 51,
-    VE = 52,
+	VE = 52,
-    AL = 64,
+	AL = 64,
-    AU = 65,
+	AU = 65,
-    AT = 66,
+	AT = 66,
-    BE = 67,
+	BE = 67,
-    BA = 68,
+	BA = 68,
-    BW = 69,
+	BW = 69,
-    BG = 70,
+	BG = 70,
-    HR = 71,
+	HR = 71,
-    CY = 72,
+	CY = 72,
-    CZ = 73,
+	CZ = 73,
-    DK = 74,
+	DK = 74,
-    EE = 75,
+	EE = 75,
-    FI = 76,
+	FI = 76,
-    FR = 77,
+	FR = 77,
-    DE = 78,
+	DE = 78,
-    GR = 79,
+	GR = 79,
-    HU = 80,
+	HU = 80,
-    IS = 81,
+	IS = 81,
-    IE = 82,
+	IE = 82,
-    IT = 83,
+	IT = 83,
-    LV = 84,
+	LV = 84,
-    LS = 85,
+	LS = 85,
-    LI = 86,
+	LI = 86,
-    LT = 87,
+	LT = 87,
-    LU = 88,
+	LU = 88,
-    MK = 89,
+	MK = 89,
-    MT = 90,
+	MT = 90,
-    ME = 91,
+	ME = 91,
-    MZ = 92,
+	MZ = 92,
-    NA = 93,
+	NA = 93,
-    NL = 94,
+	NL = 94,
-    NZ = 95,
+	NZ = 95,
-    NO = 96,
+	NO = 96,
-    PL = 97,
+	PL = 97,
-    PT = 98,
+	PT = 98,
-    RO = 99,
+	RO = 99,
-    RU = 100,
+	RU = 100,
-    RS = 101,
+	RS = 101,
-    SK = 102,
+	SK = 102,
-    SI = 103,
+	SI = 103,
-    ZA = 104,
+	ZA = 104,
-    ES = 105,
+	ES = 105,
-    SZ = 106,
+	SZ = 106,
-    SE = 107,
+	SE = 107,
-    CH = 108,
+	CH = 108,
-    TR = 109,
+	TR = 109,
-    GB = 110,
+	GB = 110,
-    ZM = 111,
+	ZM = 111,
-    ZW = 112,
+	ZW = 112,
-    AZ = 113,
+	AZ = 113,
-    MR = 114,
+	MR = 114,
-    ML = 115,
+	ML = 115,
-    NE = 116,
+	NE = 116,
-    TD = 117,
+	TD = 117,
-    SD = 118,
+	SD = 118,
-    ER = 119,
+	ER = 119,
-    DJ = 120,
+	DJ = 120,
-    SO = 121,
+	SO = 121,
-    AD = 122,
+	AD = 122,
-    GI = 123,
+	GI = 123,
-    GG = 124,
+	GG = 124,
-    IM = 125,
+	IM = 125,
-    JE = 126,
+	JE = 126,
-    MC = 127,
+	MC = 127,
-    TW = 128,
+	TW = 128,
-    KR = 136,
+	KR = 136,
-    HK = 144,
+	HK = 144,
-    MO = 145,
+	MO = 145,
-    ID = 152,
+	ID = 152,
-    SG = 153,
+	SG = 153,
-    TH = 154,
+	TH = 154,
-    PH = 155,
+	PH = 155,
-    MY = 156,
+	MY = 156,
-    CN = 160,
+	CN = 160,
-    AE = 168,
+	AE = 168,
-    IND = 169, // We can't use the 2-letter country code for India because the Windows SDK does #define IN...
+	IND = 169,  // We can't use the 2-letter country code for India because the Windows SDK does #define IN...
-    EG = 170,
+	EG = 170,
-    OM = 171,
+	OM = 171,
-    QA = 172,
+	QA = 172,
-    KW = 173,
+	KW = 173,
-    SA = 174,
+	SA = 174,
-    SY = 175,
+	SY = 175,
-    BH = 176,
+	BH = 176,
-    JO = 177,
+	JO = 177,
-    SM = 184,
+	SM = 184,
-    VA = 185,
+	VA = 185,
-    BM = 186,
+	BM = 186,
 };

src/core/audio/miniaudio_device.cpp

@@ -1,5 +1,7 @@
 #include "audio/miniaudio_device.hpp"
 
+#include <cstring>
+
 #include "helpers.hpp"
 
 MiniAudioDevice::MiniAudioDevice() : initialized(false), running(false), samples(nullptr) {}
@@ -87,20 +89,34 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
 	deviceConfig.aaudio.usage = ma_aaudio_usage_game;
 	deviceConfig.wasapi.noAutoConvertSRC = true;
 
+	lastStereoSample = {0, 0};
+
 	deviceConfig.dataCallback = [](ma_device* device, void* out, const void* input, ma_uint32 frameCount) {
 		auto self = reinterpret_cast<MiniAudioDevice*>(device->pUserData);
-		s16* output = reinterpret_cast<ma_int16*>(out);
+		if (!self->running) {
-		const usize maxSamples = std::min(self->samples->Capacity(), usize(frameCount * channelCount));
+			return;
-
-		// Wait until there's enough samples to pop
-		while (self->samples->size() < maxSamples) {
-			// If audio output is disabled from the emulator thread, make sure that this callback will return and not hang
-			if (!self->running) {
-				return;
-			}
 		}
 
-		self->samples->pop(output, maxSamples);
+		s16* output = reinterpret_cast<ma_int16*>(out);
+		usize samplesWritten = 0;
+		samplesWritten += self->samples->pop(output, frameCount * channelCount);
+
+		// Get the last sample for underrun handling
+		if (samplesWritten != 0) {
+			std::memcpy(&self->lastStereoSample[0], &output[(samplesWritten - 1) * 2], sizeof(lastStereoSample));
+		}
+
+		// If underruning, copy the last output sample
+		{
+			s16* pointer = &output[samplesWritten * 2];
+			s16 l = self->lastStereoSample[0];
+			s16 r = self->lastStereoSample[1];
+
+			for (usize i = samplesWritten; i < frameCount; i++) {
+				*pointer++ = l;
+				*pointer++ = r;
+			}
+		}
 	};
 
 	if (ma_device_init(&context, &deviceConfig, &device) != MA_SUCCESS) {

src/core/audio/null_core.cpp

@@ -82,7 +82,7 @@ namespace Audio {
 
 		scheduler.addEvent(Scheduler::EventType::RunDSP, scheduler.currentTimestamp + Audio::cyclesPerFrame);
 	}
-	
+
 	u16 NullDSP::recvData(u32 regId) {
 		if (regId != 0) {
 			Helpers::panic("Audio: invalid register in null frontend");
@@ -116,13 +116,11 @@ namespace Audio {
 							// TODO: Other initialization stuff here
 							dspState = DSPState::On;
 							resetAudioPipe();
-							
+
 							dspService.triggerPipeEvent(DSPPipeType::Audio);
 							break;
 
-						case StateChange::Shutdown:
+						case StateChange::Shutdown: dspState = DSPState::Off; break;
-							dspState = DSPState::Off;
-							break;
 
 						default: Helpers::panic("Unimplemented DSP audio pipe state change %d", state);
 					}