notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oboe_sink: specify additional required parameters

This commit is contained in:
Liam 2023-12-18 09:22:20 -05:00
parent 797e8fdbc3
commit a7731abb72
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/audio_core/sink/oboe_sink.cpp
View File

@ -29,7 +29,7 @@ public:
} }
~OboeSinkStream() override { ~OboeSinkStream() override {
LOG_DEBUG(Audio_Sink, "Destructing Oboe stream {}", name); LOG_INFO(Audio_Sink, "Destroyed Oboe stream");
} }
void Finalize() override { void Finalize() override {
@ -66,12 +66,7 @@ public:
std::shared_ptr<oboe::AudioStream> temp_stream; std::shared_ptr<oboe::AudioStream> temp_stream;
oboe::AudioStreamBuilder builder; oboe::AudioStreamBuilder builder;
const auto result = builder.setDirection(direction) const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
->setPerformanceMode(oboe::PerformanceMode::LowLatency)
->setSampleRate(TargetSampleRate)
->setFormat(oboe::AudioFormat::I16)
->setFormatConversionAllowed(true)
->openStream(temp_stream);
ASSERT(result == oboe::Result::OK); ASSERT(result == oboe::Result::OK);
return temp_stream->getChannelCount() >= 6 ? 6 : 2; return temp_stream->getChannelCount() >= 6 ? 6 : 2;
@ -106,6 +101,20 @@ protected:
} }
private: private:
static oboe::AudioStreamBuilder* ConfigureBuilder(oboe::AudioStreamBuilder& builder,
oboe::Direction direction) {
// TODO: investigate callback delay issues when using AAudio
return builder.setPerformanceMode(oboe::PerformanceMode::LowLatency)
->setAudioApi(oboe::AudioApi::OpenSLES)
->setDirection(direction)
->setSampleRate(TargetSampleRate)
->setSampleRateConversionQuality(oboe::SampleRateConversionQuality::High)
->setFormat(oboe::AudioFormat::I16)
->setFormatConversionAllowed(true)
->setUsage(oboe::Usage::Game)
->setBufferCapacityInFrames(TargetSampleCount * 2);
}
bool OpenStream() { bool OpenStream() {
const auto direction = [&]() { const auto direction = [&]() {
switch (type) { switch (type) {
@ -136,13 +145,10 @@ private:
}(); }();
oboe::AudioStreamBuilder builder; oboe::AudioStreamBuilder builder;
const auto result = builder.setDirection(direction) const auto result = ConfigureBuilder(builder, direction)
->setPerformanceMode(oboe::PerformanceMode::LowLatency)
->setSampleRate(TargetSampleRate)
->setChannelCount(expected_channels) ->setChannelCount(expected_channels)
->setChannelMask(expected_mask) ->setChannelMask(expected_mask)
->setFormat(oboe::AudioFormat::I16) ->setChannelConversionAllowed(true)
->setFormatConversionAllowed(true)
->setDataCallback(this) ->setDataCallback(this)
->setErrorCallback(this) ->setErrorCallback(this)
->openStream(m_stream); ->openStream(m_stream);
@ -153,8 +159,16 @@ private:
bool SetStreamProperties() { bool SetStreamProperties() {
ASSERT(m_stream); ASSERT(m_stream);
m_stream->setBufferSizeInFrames(TargetSampleCount * 2);
device_channels = m_stream->getChannelCount(); device_channels = m_stream->getChannelCount();
LOG_INFO(Audio_Sink, "Opened Oboe stream with {} channels", device_channels);
const auto sample_rate = m_stream->getSampleRate();
const auto buffer_capacity = m_stream->getBufferCapacityInFrames();
const auto stream_backend =
m_stream->getAudioApi() == oboe::AudioApi::AAudio ? "AAudio" : "OpenSLES";
LOG_INFO(Audio_Sink, "Opened Oboe {} stream with {} channels sample rate {} capacity {}",
stream_backend, device_channels, sample_rate, buffer_capacity);
return true; return true;
} }