From 964e19ab56385117ee77b12311eb4a959e3abf4a Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Fri, 23 Feb 2024 10:30:52 -0500
Subject: [PATCH] oboe_sink: handle temporary stream creation failure
---
src/audio_core/sink/oboe_sink.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/audio_core/sink/oboe_sink.cpp b/src/audio_core/sink/oboe_sink.cpp
index e61841172..466a9cc8e 100644
--- a/src/audio_core/sink/oboe_sink.cpp
+++ b/src/audio_core/sink/oboe_sink.cpp
@@ -67,9 +67,13 @@ public:
oboe::AudioStreamBuilder builder;
const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
- ASSERT(result == oboe::Result::OK);
+ if (result == oboe::Result::OK) {
+ return temp_stream->getChannelCount() >= 6 ? 6 : 2;
+ }
- return temp_stream->getChannelCount() >= 6 ? 6 : 2;
+ LOG_ERROR(Audio_Sink, "Failed to open {} stream. Using default channel count 2",
+ direction == oboe::Direction::Output ? "output" : "input");
+ return 2;
}
protected: