mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-19 18:36:53 +02:00
Capture PCM at set time when multiple AudioOut2 ports share a buffer (#826)
* capture PCM at set time when ports share a buffer * Snapshot size limit and open device check * Fall back to PCM pointer on stale snapshot * audio: own AudioOut2 PCM at attribute set time --------- Co-authored-by: nmzik <Nmzik@mail.ru>
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <mutex>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
@@ -16,14 +17,16 @@ namespace {
|
||||
|
||||
namespace AudioOut2 = Libs::Audio::AudioOut2;
|
||||
|
||||
std::mutex g_device_mutex;
|
||||
std::condition_variable g_device_cv;
|
||||
std::vector<int> g_live_devices;
|
||||
std::vector<int> g_device_backed_handles;
|
||||
std::vector<bool> g_output_blocking;
|
||||
int g_next_device = 1;
|
||||
int g_open_waiters = 0;
|
||||
bool g_block_opens = false;
|
||||
std::mutex g_device_mutex;
|
||||
std::condition_variable g_device_cv;
|
||||
std::vector<int> g_live_devices;
|
||||
std::vector<int> g_device_backed_handles;
|
||||
std::vector<bool> g_output_blocking;
|
||||
std::vector<std::vector<uint8_t>> g_output_pcm;
|
||||
size_t g_capture_bytes = 0;
|
||||
int g_next_device = 1;
|
||||
int g_open_waiters = 0;
|
||||
bool g_block_opens = false;
|
||||
|
||||
void Check(bool value, const char* text) {
|
||||
if (!value) {
|
||||
@@ -146,6 +149,17 @@ std::vector<bool> OutputCalls() {
|
||||
return g_output_blocking;
|
||||
}
|
||||
|
||||
void CaptureOutputPcm(size_t bytes) {
|
||||
std::lock_guard lock(g_device_mutex);
|
||||
g_capture_bytes = bytes;
|
||||
g_output_pcm.clear();
|
||||
}
|
||||
|
||||
std::vector<std::vector<uint8_t>> OutputPcm() {
|
||||
std::lock_guard lock(g_device_mutex);
|
||||
return g_output_pcm;
|
||||
}
|
||||
|
||||
void TestSlotReuse() {
|
||||
const auto context = CreateContext();
|
||||
const auto param = MakeParam();
|
||||
@@ -327,6 +341,41 @@ void TestHandleWithoutPcmDoesNotBypassQueue() {
|
||||
AudioOut2::AudioOut2ContextDestroy(context);
|
||||
}
|
||||
|
||||
void TestPcmCopiedBeforeScratchBufferReuse() {
|
||||
const auto context = CreateContext();
|
||||
const auto param = MakeParam();
|
||||
AudioOut2::AudioOut2PortHandle first = 0;
|
||||
AudioOut2::AudioOut2PortHandle second = 0;
|
||||
Check(AudioOut2::AudioOut2PortCreate(context, AsParam(¶m), &first) == OK,
|
||||
"first port create failed");
|
||||
Check(AudioOut2::AudioOut2PortCreate(context, AsParam(¶m), &second) == OK,
|
||||
"second port create failed");
|
||||
|
||||
std::vector<float> scratch(512 * 2);
|
||||
std::vector<float> first_pcm(scratch.size(), 0.25f);
|
||||
std::vector<float> second_pcm(scratch.size(), -0.5f);
|
||||
std::copy(first_pcm.begin(), first_pcm.end(), scratch.begin());
|
||||
SetPcm(first, scratch.data());
|
||||
std::copy(second_pcm.begin(), second_pcm.end(), scratch.begin());
|
||||
SetPcm(second, scratch.data());
|
||||
std::fill(scratch.begin(), scratch.end(), 0.0f);
|
||||
|
||||
const auto pcm_bytes = scratch.size() * sizeof(float);
|
||||
CaptureOutputPcm(pcm_bytes);
|
||||
Check(AudioOut2::AudioOut2ContextPush(context, 1) == OK, "shared-buffer push failed");
|
||||
const auto output = OutputPcm();
|
||||
Check(output.size() == 2, "shared-buffer push did not output both ports");
|
||||
Check(std::memcmp(output[0].data(), first_pcm.data(), pcm_bytes) == 0,
|
||||
"first port lost PCM when scratch buffer was reused");
|
||||
Check(std::memcmp(output[1].data(), second_pcm.data(), pcm_bytes) == 0,
|
||||
"second port lost PCM when scratch buffer was reused");
|
||||
|
||||
CaptureOutputPcm(0);
|
||||
AudioOut2::AudioOut2PortDestroy(first);
|
||||
AudioOut2::AudioOut2PortDestroy(second);
|
||||
AudioOut2::AudioOut2ContextDestroy(context);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace Libs::Audio::AudioInternal {
|
||||
@@ -363,9 +412,15 @@ bool AudioOutHasDevice(int handle) {
|
||||
g_device_backed_handles.end();
|
||||
}
|
||||
|
||||
uint32_t AudioOutOutputs(const OutputParam* /*params*/, uint32_t /*num*/, bool blocking) {
|
||||
uint32_t AudioOutOutputs(const OutputParam* params, uint32_t num, bool blocking) {
|
||||
std::lock_guard lock(g_device_mutex);
|
||||
g_output_blocking.push_back(blocking);
|
||||
if (g_capture_bytes != 0) {
|
||||
for (uint32_t i = 0; i < num; i++) {
|
||||
const auto* bytes = static_cast<const uint8_t*>(params[i].data);
|
||||
g_output_pcm.emplace_back(bytes, bytes + g_capture_bytes);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -389,6 +444,7 @@ int main() {
|
||||
TestFloat12ChannelPortOutputsPcm();
|
||||
TestAsynchronousDevicePushKeepsQueueBounded();
|
||||
TestHandleWithoutPcmDoesNotBypassQueue();
|
||||
TestPcmCopiedBeforeScratchBufferReuse();
|
||||
std::printf("AudioOut2PortTests: all cases passed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user