mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-12 09:09:29 +01:00
Android: Use OpenSL ES for audio on TVs, add audio API and MMAP settings
An Android 11 TV played nothing over a Bluetooth headset since the switch to Oboe, while its speakers worked. Testing on it showed AAudio with MMAP is silent there and AAudio without MMAP works, as does OpenSL ES (also when the headset is connected mid-game), whatever the stream usage. MMAP should never be used for a Bluetooth route, so it's a firmware bug. Audio settings get an Audio API choice and a Low-latency audio (MMAP) checkbox, with hints, so other devices with the same kind of bug can be worked around. The API defaults to OpenSL ES on TVs and before Android 8.1, where the choice isn't offered, and AAudio elsewhere. Changing them reopens the streams right away. System Information shows the output stream that got opened (API, MMAP or not, rate, buffers, device) and any audio error. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b438655479
commit
a5c90b61df
8 files changed
+129
-12
No files matched your search
@@ -6,8 +6,12 @@
|
||||
#include "android/jni/OboeContext.h"
|
||||
|
||||
std::string g_error;
|
||||
std::string g_info;
|
||||
std::mutex g_errorMutex;
|
||||
|
||||
// Pause and resume come from the Java UI thread, a restart from the settings screen.
|
||||
static std::mutex g_ctxMutex;
|
||||
|
||||
// From the input stream's callback to the CPU thread. 0.7 s at 44.1 kHz.
|
||||
static SampleRing<32768> g_micRing;
|
||||
|
||||
@@ -22,6 +26,7 @@ AudioContext::AudioContext(AndroidAudioCallback cb, int _FramesPerBuffer, int _S
|
||||
|
||||
sampleRate = _SampleRate;
|
||||
g_error = "";
|
||||
g_info = "";
|
||||
}
|
||||
|
||||
void AudioContext::SetErrorString(const std::string &error) {
|
||||
@@ -29,6 +34,11 @@ void AudioContext::SetErrorString(const std::string &error) {
|
||||
g_error = error;
|
||||
}
|
||||
|
||||
void AudioContext::SetInfoString(const std::string &info) {
|
||||
std::unique_lock<std::mutex> lock(g_errorMutex);
|
||||
g_info = info;
|
||||
}
|
||||
|
||||
struct AndroidAudioState {
|
||||
AudioContext *ctx = nullptr;
|
||||
AndroidAudioCallback callback = nullptr;
|
||||
@@ -63,6 +73,7 @@ bool AndroidAudio_Recording_Start(AndroidAudioState *state) {
|
||||
ERROR_LOG(Log::Audio, "AndroidAudioState not initialized, cannot start recording!");
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::mutex> guard(g_ctxMutex);
|
||||
state->input_enable = 1;
|
||||
if (!state->ctx) {
|
||||
ERROR_LOG(Log::Audio, "Audio context not initialized, cannot start recording!");
|
||||
@@ -78,6 +89,7 @@ bool AndroidAudio_Recording_Stop(AndroidAudioState *state) {
|
||||
ERROR_LOG(Log::Audio, "AndroidAudioState not initialized, cannot stop recording!");
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::mutex> guard(g_ctxMutex);
|
||||
// Clear these even while paused, or resume would start the mic again.
|
||||
state->input_enable = 0;
|
||||
state->input_sample_rate = 0;
|
||||
@@ -103,30 +115,50 @@ void AndroidAudio_Recording_Clear() {
|
||||
g_micRing.Clear();
|
||||
}
|
||||
|
||||
static bool StartContext(AndroidAudioState *state) {
|
||||
state->ctx = new OboeContext(state->callback, state->frames_per_buffer, state->sample_rate);
|
||||
bool init_retval = state->ctx->Init();
|
||||
if (!init_retval) {
|
||||
delete state->ctx;
|
||||
state->ctx = nullptr;
|
||||
} else if (state->input_enable) {
|
||||
state->ctx->AudioRecord_Start(state->input_sample_rate);
|
||||
}
|
||||
return init_retval;
|
||||
}
|
||||
|
||||
bool AndroidAudio_Resume(AndroidAudioState *state) {
|
||||
if (!state) {
|
||||
ERROR_LOG(Log::Audio, "Audio was shutdown, cannot resume!");
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::mutex> guard(g_ctxMutex);
|
||||
if (!state->ctx) {
|
||||
state->ctx = new OboeContext(state->callback, state->frames_per_buffer, state->sample_rate);
|
||||
bool init_retval = state->ctx->Init();
|
||||
if (!init_retval) {
|
||||
delete state->ctx;
|
||||
state->ctx = nullptr;
|
||||
} else if (state->input_enable) {
|
||||
state->ctx->AudioRecord_Start(state->input_sample_rate);
|
||||
}
|
||||
return init_retval;
|
||||
return StartContext(state);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AndroidAudio_Restart(AndroidAudioState *state) {
|
||||
if (!state) {
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::mutex> guard(g_ctxMutex);
|
||||
// While paused, there's nothing to restart. Resume picks up the settings.
|
||||
if (!state->ctx) {
|
||||
return false;
|
||||
}
|
||||
delete state->ctx;
|
||||
state->ctx = nullptr;
|
||||
return StartContext(state);
|
||||
}
|
||||
|
||||
bool AndroidAudio_Pause(AndroidAudioState *state) {
|
||||
if (!state) {
|
||||
ERROR_LOG(Log::Audio, "Audio was shutdown, cannot pause!");
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::mutex> guard(g_ctxMutex);
|
||||
if (state->ctx) {
|
||||
delete state->ctx;
|
||||
state->ctx = nullptr;
|
||||
@@ -156,3 +188,11 @@ const std::string AndroidAudio_GetErrorString(AndroidAudioState *state) {
|
||||
std::unique_lock<std::mutex> lock(g_errorMutex);
|
||||
return g_error;
|
||||
}
|
||||
|
||||
const std::string AndroidAudio_GetInfoString(AndroidAudioState *state) {
|
||||
if (!state) {
|
||||
return "";
|
||||
}
|
||||
std::unique_lock<std::mutex> lock(g_errorMutex);
|
||||
return g_info;
|
||||
}
|
||||
Reference in new issue
Block a user