Android #164

README.md

@@ -1,8 +1,9 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
 | [12304](https://github.com/yuzu-emu/yuzu//pull/12304) | [`fcc85abe2`](https://github.com/yuzu-emu/yuzu//pull/12304/files) | nvnflinger: mark buffer as acquired when acquired | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12349](https://github.com/yuzu-emu/yuzu//pull/12349) | [`6851e9329`](https://github.com/yuzu-emu/yuzu//pull/12349/files) | Have GetActiveChannelCount return the system channels instead of host device channels | [Kelebek1](https://github.com/Kelebek1/) | Yes |
 | [12382](https://github.com/yuzu-emu/yuzu//pull/12382) | [`7fc06260d`](https://github.com/yuzu-emu/yuzu//pull/12382/files) | renderer_vulkan: allow up to 7 swapchain images | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12387](https://github.com/yuzu-emu/yuzu//pull/12387) | [`a7731abb7`](https://github.com/yuzu-emu/yuzu//pull/12387/files) | android: add oboe audio sink | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12387](https://github.com/yuzu-emu/yuzu//pull/12387) | [`6ca530a72`](https://github.com/yuzu-emu/yuzu//pull/12387/files) | android: add oboe audio sink | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [12391](https://github.com/yuzu-emu/yuzu//pull/12391) | [`65e646eeb`](https://github.com/yuzu-emu/yuzu//pull/12391/files) | Revert "video_core: use interval map for page count tracking" | [liamwhite](https://github.com/liamwhite/) | Yes |
 
 

src/audio_core/sink/oboe_sink.cpp

@@ -29,7 +29,7 @@ public:
     }
 
     ~OboeSinkStream() override {
-        LOG_INFO(Audio_Sink, "Destroyed Oboe stream");
+        LOG_DEBUG(Audio_Sink, "Destructing Oboe stream {}", name);
     }
 
     void Finalize() override {
@@ -66,7 +66,11 @@ public:
         std::shared_ptr<oboe::AudioStream> temp_stream;
         oboe::AudioStreamBuilder builder;
 
-        const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
+        const auto result = builder.setDirection(direction)
+                                ->setSampleRate(TargetSampleRate)
+                                ->setFormat(oboe::AudioFormat::I16)
+                                ->setFormatConversionAllowed(true)
+                                ->openStream(temp_stream);
         ASSERT(result == oboe::Result::OK);
 
         return temp_stream->getChannelCount() >= 6 ? 6 : 2;
@@ -101,20 +105,6 @@ protected:
     }
 
 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() {
         const auto direction = [&]() {
             switch (type) {
@@ -145,10 +135,12 @@ private:
         }();
 
         oboe::AudioStreamBuilder builder;
-        const auto result = ConfigureBuilder(builder, direction)
+        const auto result = builder.setDirection(direction)
+                                ->setSampleRate(TargetSampleRate)
                                 ->setChannelCount(expected_channels)
                                 ->setChannelMask(expected_mask)
-                                ->setChannelConversionAllowed(true)
+                                ->setFormat(oboe::AudioFormat::I16)
+                                ->setFormatConversionAllowed(true)
                                 ->setDataCallback(this)
                                 ->setErrorCallback(this)
                                 ->openStream(m_stream);
@@ -159,16 +151,8 @@ private:
     bool SetStreamProperties() {
         ASSERT(m_stream);
 
-        m_stream->setBufferSizeInFrames(TargetSampleCount * 2);
         device_channels = m_stream->getChannelCount();
-
-        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);
+        LOG_INFO(Audio_Sink, "Opened Oboe stream with {} channels", device_channels);
 
         return true;
     }