fixup stuffs

Signed-off-by: lizzie <lizzie@eden-emu.dev>

cpmfile.json

@@ -179,12 +179,6 @@
         "repo": "eden-emulator/oaknut",
         "version": "v2.0.3"
     },
-    "oboe": {
-        "bundled": true,
-        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
-        "repo": "google/oboe",
-        "version": "1.10.0"
-    },
     "openssl": {
         "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
         "min_version": "3.0.0",

externals/CMakeLists.txt

@@ -388,13 +388,6 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
     endif()
 endif()
 
-# oboe
-if (ANDROID)
-    AddJsonPackage(oboe)
-
-    add_library(oboe::oboe ALIAS oboe)
-endif()
-
 if (APPLE)
     # moltenvk
     if (NOT YUZU_USE_BUNDLED_MOLTENVK)

src/android/app/src/main/res/values-fa/strings.xml

@@ -799,10 +799,6 @@
     <string name="theme_mode_light">روشن</string>
     <string name="theme_mode_dark">تاریک</string>
 
-    <!-- Audio output engines -->
-    <string name="oboe">oboe</string>
-    <string name="cubeb">cubeb</string>
-
     <!-- Anisotropic filtering options -->
     <string name="multiplier_x2">x2</string>
     <string name="multiplier_x4">x4</string>

src/android/app/src/main/res/values/arrays.xml

@@ -465,14 +465,14 @@
 
     <string-array name="outputEngineEntries">
         <item>@string/auto</item>
-        <item>@string/oboe</item>
         <item>@string/cubeb</item>
+        <item>@string/sdl3</item>
         <item>@string/string_null</item>
     </string-array>
     <integer-array name="outputEngineValues">
         <item>0</item>
-        <item>4</item>
         <item>1</item>
+        <item>2</item>
         <item>3</item>
     </integer-array>
 

src/android/app/src/main/res/values/strings.xml

@@ -1240,7 +1240,7 @@
     <string name="theme_mode_dark">Dark</string>
 
     <!-- Audio output engines -->
-    <string name="oboe" translatable="false">oboe</string>
+    <string name="sdl3" translatable="false">sdl3</string>
     <string name="cubeb" translatable="false">cubeb</string>
 
     <!-- Anisotropic filtering options -->

src/audio_core/CMakeLists.txt

@@ -238,20 +238,10 @@ if (ENABLE_CUBEB)
     target_compile_definitions(audio_core PRIVATE HAVE_CUBEB=1)
 endif()
 
-if(ANDROID)
-    target_sources(audio_core PRIVATE
-        sink/oboe_sink.cpp
-        sink/oboe_sink.h)
-
-    target_link_libraries(audio_core PRIVATE oboe)
-    target_compile_definitions(audio_core PUBLIC HAVE_OBOE)
-else()
-    target_sources(audio_core PRIVATE
-        sink/sdl3_sink.cpp
-        sink/sdl3_sink.h)
-
-    target_link_libraries(audio_core PRIVATE SDL3::SDL3)
-    target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
-endif()
+target_sources(audio_core PRIVATE
+    sink/sdl3_sink.cpp
+    sink/sdl3_sink.h)
+target_link_libraries(audio_core PRIVATE SDL3::SDL3)
+target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
 
 create_target_directory_groups(audio_core)

src/audio_core/sink/oboe_sink.cpp

@@ -1,230 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <span>
-#include <vector>
-
-#include <oboe/Oboe.h>
-
-#include "audio_core/common/common.h"
-#include "audio_core/sink/oboe_sink.h"
-#include "audio_core/sink/sink_stream.h"
-#include "common/logging.h"
-#include "common/scope_exit.h"
-#include "core/core.h"
-
-namespace AudioCore::Sink {
-
-class OboeSinkStream final : public SinkStream,
-                             public oboe::AudioStreamDataCallback,
-                             public oboe::AudioStreamErrorCallback {
-public:
-    explicit OboeSinkStream(Core::System& system_, StreamType type_, const std::string& name_,
-                            u32 system_channels_)
-        : SinkStream(system_, type_) {
-        name = name_;
-        system_channels = system_channels_;
-
-        this->OpenStream();
-    }
-
-    ~OboeSinkStream() override {
-        LOG_INFO(Audio_Sink, "Destroyed Oboe stream");
-    }
-
-    void Finalize() override {
-        this->Stop();
-        m_stream.reset();
-    }
-
-    void Start(bool resume = false) override {
-        if (!m_stream || !paused) {
-            return;
-        }
-
-        paused = false;
-
-        if (m_stream->start() != oboe::Result::OK) {
-            LOG_CRITICAL(Audio_Sink, "Error starting Oboe stream");
-        }
-    }
-
-    void Stop() override {
-        if (!m_stream || paused) {
-            return;
-        }
-
-        this->SignalPause();
-
-        if (m_stream->stop() != oboe::Result::OK) {
-            LOG_CRITICAL(Audio_Sink, "Error stopping Oboe stream");
-        }
-    }
-
-public:
-    static s32 QueryChannelCount(oboe::Direction direction) {
-        std::shared_ptr<oboe::AudioStream> temp_stream;
-        oboe::AudioStreamBuilder builder;
-
-        const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
-        if (result == oboe::Result::OK) {
-            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:
-    oboe::DataCallbackResult onAudioReady(oboe::AudioStream*, void* audio_data,
-                                          s32 num_buffer_frames) override {
-        const size_t num_channels = this->GetDeviceChannels();
-        const size_t frame_size = num_channels;
-        const size_t num_frames = static_cast<size_t>(num_buffer_frames);
-
-        if (type == StreamType::In) {
-            std::span<const s16> input_buffer{reinterpret_cast<const s16*>(audio_data),
-                                              num_frames * frame_size};
-            this->ProcessAudioIn(input_buffer, num_frames);
-        } else {
-            std::span<s16> output_buffer{reinterpret_cast<s16*>(audio_data),
-                                         num_frames * frame_size};
-            this->ProcessAudioOutAndRender(output_buffer, num_frames);
-        }
-
-        return oboe::DataCallbackResult::Continue;
-    }
-
-    void onErrorAfterClose(oboe::AudioStream*, oboe::Result) override {
-        LOG_INFO(Audio_Sink, "Audio stream closed, reinitializing");
-
-        if (this->OpenStream()) {
-            m_stream->start();
-        }
-    }
-
-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) {
-            case StreamType::In:
-                return oboe::Direction::Input;
-            case StreamType::Out:
-            case StreamType::Render:
-                return oboe::Direction::Output;
-            default:
-                ASSERT(false);
-                return oboe::Direction::Output;
-            }
-        }();
-
-        const auto expected_channels = QueryChannelCount(direction);
-        const auto expected_mask = [&]() {
-            switch (expected_channels) {
-            case 1:
-                return oboe::ChannelMask::Mono;
-            case 2:
-                return oboe::ChannelMask::Stereo;
-            case 6:
-                return oboe::ChannelMask::CM5Point1;
-            default:
-                ASSERT(false);
-                return oboe::ChannelMask::Unspecified;
-            }
-        }();
-
-        oboe::AudioStreamBuilder builder;
-        const auto result = ConfigureBuilder(builder, direction)
-                                ->setChannelCount(expected_channels)
-                                ->setChannelMask(expected_mask)
-                                ->setChannelConversionAllowed(true)
-                                ->setDataCallback(this)
-                                ->setErrorCallback(this)
-                                ->openStream(m_stream);
-        ASSERT(result == oboe::Result::OK);
-        return result == oboe::Result::OK && this->SetStreamProperties();
-    }
-
-    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);
-
-        return true;
-    }
-
-    std::shared_ptr<oboe::AudioStream> m_stream{};
-};
-
-OboeSink::OboeSink() {
-    // TODO: This is not generally knowable
-    // The channel count is distinct based on direction and can change
-    device_channels = OboeSinkStream::QueryChannelCount(oboe::Direction::Output);
-}
-
-OboeSink::~OboeSink() = default;
-
-SinkStream* OboeSink::AcquireSinkStream(Core::System& system, u32 system_channels,
-                                        const std::string& name, StreamType type) {
-    SinkStreamPtr& stream = sink_streams.emplace_back(
-        std::make_unique<OboeSinkStream>(system, type, name, system_channels));
-
-    return stream.get();
-}
-
-void OboeSink::CloseStream(SinkStream* to_remove) {
-    sink_streams.remove_if([&](auto& stream) { return stream.get() == to_remove; });
-}
-
-void OboeSink::CloseStreams() {
-    sink_streams.clear();
-}
-
-f32 OboeSink::GetDeviceVolume() const {
-    if (sink_streams.empty()) {
-        return 1.0f;
-    }
-
-    return sink_streams.front()->GetDeviceVolume();
-}
-
-void OboeSink::SetDeviceVolume(f32 volume) {
-    for (auto& stream : sink_streams) {
-        stream->SetDeviceVolume(volume);
-    }
-}
-
-void OboeSink::SetSystemVolume(f32 volume) {
-    for (auto& stream : sink_streams) {
-        stream->SetSystemVolume(volume);
-    }
-}
-
-} // namespace AudioCore::Sink

src/audio_core/sink/oboe_sink.h

@@ -1,75 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <list>
-#include <string>
-
-#include "audio_core/sink/sink.h"
-
-namespace Core {
-class System;
-}
-
-namespace AudioCore::Sink {
-class SinkStream;
-
-class OboeSink final : public Sink {
-public:
-    explicit OboeSink();
-    ~OboeSink() override;
-
-    /**
-     * Create a new sink stream.
-     *
-     * @param system          - Core system.
-     * @param system_channels - Number of channels the audio system expects.
-     *                          May differ from the device's channel count.
-     * @param name            - Name of this stream.
-     * @param type            - Type of this stream, render/in/out.
-     *
-     * @return A pointer to the created SinkStream
-     */
-    SinkStream* AcquireSinkStream(Core::System& system, u32 system_channels,
-                                  const std::string& name, StreamType type) override;
-
-    /**
-     * Close a given stream.
-     *
-     * @param stream - The stream to close.
-     */
-    void CloseStream(SinkStream* stream) override;
-
-    /**
-     * Close all streams.
-     */
-    void CloseStreams() override;
-
-    /**
-     * Get the device volume. Set from calls to the IAudioDevice service.
-     *
-     * @return Volume of the device.
-     */
-    f32 GetDeviceVolume() const override;
-
-    /**
-     * Set the device volume. Set from calls to the IAudioDevice service.
-     *
-     * @param volume - New volume of the device.
-     */
-    void SetDeviceVolume(f32 volume) override;
-
-    /**
-     * Set the system volume. Comes from the audio system using this stream.
-     *
-     * @param volume - New volume of the system.
-     */
-    void SetSystemVolume(f32 volume) override;
-
-private:
-    /// List of streams managed by this sink
-    std::list<SinkStreamPtr> sink_streams{};
-};
-
-} // namespace AudioCore::Sink

src/audio_core/sink/sink_details.cpp

@@ -10,9 +10,6 @@
 #include <vector>
 
 #include "audio_core/sink/sink_details.h"
-#ifdef HAVE_OBOE
-#include "audio_core/sink/oboe_sink.h"
-#endif
 #ifdef HAVE_CUBEB
 #include "audio_core/sink/cubeb_sink.h"
 #endif
@@ -51,16 +48,6 @@ struct SinkDetails {
 
 // sink_details is ordered in terms of desirability, with the best choice at the top.
 constexpr SinkDetails sink_details[] = {
-#ifdef HAVE_OBOE
-    SinkDetails{
-        Settings::AudioEngine::Oboe,
-        [](std::string_view device_id) -> std::unique_ptr<Sink> {
-            return std::make_unique<OboeSink>();
-        },
-        [](bool capture) { return std::vector<std::string>{"Default"}; },
-        []() { return 0u; },
-    },
-#endif
 #ifdef HAVE_CUBEB
     SinkDetails{
         Settings::AudioEngine::Cubeb,

src/common/settings_enums.h

@@ -92,14 +92,14 @@ struct EnumMetadata {
 // AudioEngine must be specified discretely due to having existing but slightly different
 // canonicalizations
 // TODO (lat9nq): Remove explicit definition of AudioEngine/sink_id
-enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, Oboe, };
+enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, };
 template<>
 inline std::vector<std::pair<std::string_view, AudioEngine>> EnumMetadata<AudioEngine>::Canonicalizations() {
     return {
         {"auto", AudioEngine::Auto},
         {"cubeb", AudioEngine::Cubeb},
         {"sdl3", AudioEngine::Sdl3},
-        {"null", AudioEngine::Null}, {"oboe", AudioEngine::Oboe},
+        {"null", AudioEngine::Null},
     };
 }
 /// @brief This is just a sufficiently large number that is more than the number of other enums declared here
@@ -113,7 +113,7 @@ inline AudioEngine EnumMetadata<AudioEngine>::GetFirst() {
 }
 template<>
 inline AudioEngine EnumMetadata<AudioEngine>::GetLast() {
-    return AudioEngine::Oboe;
+    return AudioEngine::Null;
 }
 
 ENUM(AudioMode, Mono, Stereo, Surround);

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -42,7 +42,7 @@ u64 DynarmicCallbacks32::MemoryRead64(u32 vaddr) {
 std::optional<u32> DynarmicCallbacks32::MemoryReadCode(u32 vaddr) {
     if (!m_memory.IsValidVirtualAddressRange(vaddr, sizeof(u32)))
         return std::nullopt;
-    auto const aligned_vaddr = vaddr & u32(~Core::Memory::YUZU_PAGEMASK);
+    auto const aligned_vaddr = vaddr & ~Core::Memory::YUZU_PAGEMASK;
     if (last_code_addr != aligned_vaddr) {
         m_memory.ReadBlock(aligned_vaddr, &cached_code_page, sizeof(cached_code_page));
         last_code_addr = aligned_vaddr;
@@ -420,13 +420,11 @@ void ArmDynarmic32::SignalInterrupt(Kernel::KThread* thread) {
 }
 
 void ArmDynarmic32::ClearInstructionCache() {
-    m_cb->last_code_addr = u32(-1);
     m_jit->ClearCache();
 }
 
 void ArmDynarmic32::InvalidateCacheRange(u64 addr, std::size_t size) {
-    m_cb->last_code_addr = u32(-1);
-    m_jit->InvalidateCacheRange(u32(addr), size);
+    m_jit->InvalidateCacheRange(static_cast<u32>(addr), size);
 }
 
 } // namespace Core

src/core/arm/dynarmic/arm_dynarmic_32.h

@@ -36,7 +36,7 @@ public:
     u64 MemoryRead64(u32 vaddr) override;
     std::optional<u32> MemoryReadCode(u32 vaddr) override;
     void InstructionSynchronizationBarrierRaised() override {
-        last_code_addr = u32(-1); //reset back, force refetch
+        last_code_addr = u64(-1); //reset back, force refetch
     }
     void MemoryWrite8(u32 vaddr, u8 value) override;
     void MemoryWrite16(u32 vaddr, u16 value) override;
@@ -54,7 +54,7 @@ public:
     void ReturnException(u32 pc, Dynarmic::HaltReason hr);
     //
     Dynarmic::CodePage cached_code_page;
-    u32 last_code_addr = u32(-1);
+    u64 last_code_addr = u64(-1);
     ArmDynarmic32& m_parent;
     Core::Memory::Memory& m_memory;
     Kernel::KProcess* m_process{};

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -105,7 +105,7 @@ void DynarmicCallbacks64::InstructionCacheOperationRaised(Dynarmic::A64::Instruc
     last_code_addr = u64(-1); //invalidate cached page
     switch (op) {
     case Dynarmic::A64::InstructionCacheOperation::InvalidateByVAToPoU: {
-        constexpr u64 ICACHE_LINE_SIZE = 64;
+        static constexpr u64 ICACHE_LINE_SIZE = 64;
         const u64 cache_line_start = value & ~(ICACHE_LINE_SIZE - 1);
         m_parent.InvalidateCacheRange(cache_line_start, ICACHE_LINE_SIZE);
         break;
@@ -447,12 +447,10 @@ void ArmDynarmic64::SignalInterrupt(Kernel::KThread* thread) {
 }
 
 void ArmDynarmic64::ClearInstructionCache() {
-    m_cb->last_code_addr = u64(-1);
     m_jit->ClearCache();
 }
 
 void ArmDynarmic64::InvalidateCacheRange(u64 addr, std::size_t size) {
-    m_cb->last_code_addr = u64(-1);
     m_jit->InvalidateCacheRange(addr, size);
 }