2026-09-07 19:59:16

Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-09-07 19:54:19
2026-09-07 20:50:58 +00:00 · 2026-09-07 19:59:16 +00:00 · 2026-09-07 19:54:19 +00:00 · 2026-09-07 09:38:06 +00:00 · 2026-09-07 08:28:23 +00:00 · 2026-09-07 08:16:44 +00:00
75 changed files with 9225 additions and 9767 deletions
@@ -1,28 +0,0 @@
-From cc15da16e533b2a801934eab2dfeaf3c3949a1dc Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Mon, 8 Sep 2025 12:28:55 -0400
-Subject: [PATCH] [cmake] disable NEON runtime check on clang-cl
-
-When enabling runtime NEON checking for clang-cl, the linker would error out with `undefined symbol: __emit`, since clang doesn't actually implement this instruction. Therefore it makes sense to disable the runtime check by default on this platform, until either this is fixed or a clang-cl compatible intrinsic check is added (I don't have enough knowledge of MSVC to do this)
---
- cmake/OpusConfig.cmake | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/OpusConfig.cmake b/cmake/OpusConfig.cmake
-index e9319fbad..d0f459e88 100644
--- a/cmake/OpusConfig.cmake
-+++ b/cmake/OpusConfig.cmake
-@@ -71,7 +71,12 @@ elseif(OPUS_CPU_ARM AND NOT OPUS_DISABLE_INTRINSICS)
-   opus_detect_neon(COMPILER_SUPPORT_NEON)
-   if(COMPILER_SUPPORT_NEON)
-     option(OPUS_USE_NEON "Option to enable NEON" ON)
-    option(OPUS_MAY_HAVE_NEON "Does runtime check for neon support" ON)
-+    if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+      set(NEON_RUNTIME_CHECK_DEFAULT OFF)
-+    else()
-+      set(NEON_RUNTIME_CHECK_DEFAULT ON)
-+    endif()
-+    option(OPUS_MAY_HAVE_NEON "Does runtime check for neon support" ${NEON_RUNTIME_CHECK_DEFAULT})
-     option(OPUS_PRESUME_NEON "Assume target CPU has NEON support" OFF)
-     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-       set(OPUS_PRESUME_NEON ON)
@@ -1,153 +0,0 @@
-From bf455b67b4eaa446ffae5d25410b141b7b1b1082 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Mon, 8 Sep 2025 12:08:20 -0400
-Subject: [PATCH] [cmake] `OPUS_INSTALL` option; only default install if root
- project
-
-Signed-off-by: crueter <crueter@eden-emu.dev>
---
- CMakeLists.txt | 112 ++++++++++++++++++++++++++++---------------------
- 1 file changed, 64 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcf034b19..08b5e16f8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- include(OpusPackageVersion)
- get_package_version(PACKAGE_VERSION PROJECT_VERSION)
- 
-+# root project detection
-+if(DEFINED PROJECT_NAME)
-+  set(root_project OFF)
-+else()
-+  set(root_project ON)
-+endif()
-+
- project(Opus LANGUAGES C VERSION ${PROJECT_VERSION})
- 
- include(OpusFunctions)
-@@ -83,12 +90,16 @@ set(OPUS_DNN_FLOAT_DEBUG_HELP_STR "Run DNN computations as float for debugging p
- option(OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR} OFF)
- add_feature_info(OPUS_DNN_FLOAT_DEBUG OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR})
- 
-+set(OPUS_INSTALL_HELP_STR "Install Opus targets")
-+option(OPUS_INSTALL ${OPUS_INSTALL_HELP_STR} ${root_project})
-+add_feature_info(OPUS_INSTALL OPUS_INSTALL ${OPUS_INSTALL_HELP_STR})
-+
- set(OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR "install pkg-config module.")
-option(OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ON)
-+option(OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ${OPUS_INSTALL})
- add_feature_info(OPUS_INSTALL_PKG_CONFIG_MODULE OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR})
- 
- set(OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR "install CMake package config module.")
-option(OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ON)
-+option(OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ${OPUS_INSTALL})
- add_feature_info(OPUS_INSTALL_CMAKE_CONFIG_MODULE OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR})
- 
- set(OPUS_DRED_HELP_STR "enable DRED.")
-@@ -613,53 +624,58 @@ if(OPUS_BUILD_FRAMEWORK)
-                         OUTPUT_NAME Opus)
- endif()
- 
-install(TARGETS opus
-        EXPORT OpusTargets
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opus)
-
-if(OPUS_INSTALL_PKG_CONFIG_MODULE)
-  set(prefix ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-  set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
-  set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-  set(VERSION ${PACKAGE_VERSION})
-  if(HAVE_LIBM)
-    set(LIBM "-lm")
-+if (OPUS_INSTALL)
-+  install(TARGETS opus
-+          EXPORT OpusTargets
-+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+          FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-+          PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opus)
-+
-+  if(OPUS_INSTALL_PKG_CONFIG_MODULE)
-+    set(prefix ${CMAKE_INSTALL_PREFIX})
-+    set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-+    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
-+    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-+    set(VERSION ${PACKAGE_VERSION})
-+    if(HAVE_LIBM)
-+      set(LIBM "-lm")
-+    endif()
-+    configure_file(opus.pc.in opus.pc)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/opus.pc
-+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+  endif()
-+
-+  if(OPUS_INSTALL_CMAKE_CONFIG_MODULE)
-+    set(CPACK_GENERATOR TGZ)
-+    include(CPack)
-+    set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-+    install(EXPORT OpusTargets
-+            NAMESPACE Opus::
-+            DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-+
-+    include(CMakePackageConfigHelpers)
-+
-+    set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-+    configure_package_config_file(
-+      ${PROJECT_SOURCE_DIR}/cmake/OpusConfig.cmake.in
-+      OpusConfig.cmake
-+      INSTALL_DESTINATION
-+      ${CMAKE_INSTALL_PACKAGEDIR}
-+      PATH_VARS
-+      INCLUDE_INSTALL_DIR
-+      INSTALL_PREFIX
-+      ${CMAKE_INSTALL_PREFIX})
-+
-+    write_basic_package_version_file(OpusConfigVersion.cmake
-+                                    VERSION ${PROJECT_VERSION}
-+                                    COMPATIBILITY SameMajorVersion)
-+
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpusConfig.cmake
-+                  ${CMAKE_CURRENT_BINARY_DIR}/OpusConfigVersion.cmake
-+            DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-   endif()
-  configure_file(opus.pc.in opus.pc)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/opus.pc
-          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-endif()
-
-if(OPUS_INSTALL_CMAKE_CONFIG_MODULE)
-  set(CPACK_GENERATOR TGZ)
-  include(CPack)
-  set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-  install(EXPORT OpusTargets
-          NAMESPACE Opus::
-          DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-
-  include(CMakePackageConfigHelpers)
-
-  set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-  configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/OpusConfig.cmake.in
-                                OpusConfig.cmake
-                                INSTALL_DESTINATION
-                                ${CMAKE_INSTALL_PACKAGEDIR}
-                                PATH_VARS
-                                INCLUDE_INSTALL_DIR
-                                INSTALL_PREFIX
-                                ${CMAKE_INSTALL_PREFIX})
-  write_basic_package_version_file(OpusConfigVersion.cmake
-                                   VERSION ${PROJECT_VERSION}
-                                   COMPATIBILITY SameMajorVersion)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpusConfig.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/OpusConfigVersion.cmake
-          DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
- endif()
- 
- if(OPUS_BUILD_PROGRAMS)
@@ -462,21 +462,6 @@ if (NOT YUZU_STATIC_ROOM)
    if (ZLIB_ADDED)
        add_library(ZLIB::ZLIB ALIAS zlibstatic)
    endif()
-
-    # Opus
-    AddJsonPackage(opus)
-
-    if (Opus_ADDED)
-        if (MSVC AND CXX_CLANG)
-            target_compile_options(opus PRIVATE
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-function-declaration>
-            )
-        endif()
-    endif()
-
-    if (NOT TARGET Opus::opus)
-        add_library(Opus::opus ALIAS opus)
-    endif()
 endif()

 if(NOT TARGET Boost::headers)
@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-find_package(PkgConfig QUIET)
-pkg_search_module(OPUS QUIET IMPORTED_TARGET opus)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Opus
-    REQUIRED_VARS OPUS_LINK_LIBRARIES
-    VERSION_VAR OPUS_VERSION
-)
-
-if (MSYS2)
-    FixMsysPath(PkgConfig::OPUS)
-endif()
-
-if (Opus_FOUND AND NOT TARGET Opus::opus)
-    add_library(Opus::opus ALIAS PkgConfig::OPUS)
-endif()
@@ -82,7 +82,7 @@
        "name": "ffmpeg",
        "package": "FFmpeg",
        "repo": "crueter-ci/FFmpeg",
-        "version": "9.0.1-1788120736-bf1b838f2a"
+        "version": "9.0.1-1788303113-bf1b838f2a"
    },
    "fmt": {
        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
@@ -210,21 +210,6 @@
        "repo": "jimmy-park/openssl-cmake",
        "version": "3.6.2"
    },
-    "opus": {
-        "find_args": "MODULE",
-        "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
-        "min_version": "1.3",
-        "options": [
-            "OPUS_PRESUME_NEON ON"
-        ],
-        "package": "Opus",
-        "patches": [
-            "0001-disable-clang-runtime-neon.patch",
-            "0002-no-install.patch"
-        ],
-        "repo": "xiph/opus",
-        "version": "a3f0ec02b3"
-    },
    "quazip": {
        "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
        "min_version": "1.3",
@@ -60,7 +60,6 @@ All other dependencies will be downloaded and built by [CPM](https://github.com/
 * [ZLIB](https://www.zlib.net/) 1.2+
 * [zstd](https://facebook.github.io/zstd/) 1.5+
 * [enet](http://enet.bespin.org/) 1.3+
-* [Opus](https://opus-codec.org/) 1.3+

 Vulkan 1.3.274+ is also needed:

@@ -121,7 +120,7 @@ sudo emerge -a \
    dev-libs/boost dev-libs/openssl dev-libs/discord-rpc \
    dev-util/spirv-tools dev-util/spirv-headers dev-util/vulkan-headers \
    dev-util/vulkan-utility-libraries dev-util/glslang \
-    media-gfx/renderdoc media-libs/libva media-libs/opus media-video/ffmpeg \
+    media-gfx/renderdoc media-libs/libva media-video/ffmpeg \
    media-libs/VulkanMemoryAllocator media-libs/libsdl3 media-libs/cubeb \
    net-libs/enet \
    sys-libs/zlib \
@@ -153,7 +152,7 @@ Required USE flags:
 <summary>Arch Linux</summary>

 ```sh
-sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glslang libzip lz4 ninja nlohmann-json openssl opus qt6-base qt6-multimedia qt6-charts sdl3 zlib zstd zip unzip vulkan-headers vulkan-utility-libraries libusb spirv-tools spirv-headers
+sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glslang libzip lz4 ninja nlohmann-json openssl qt6-base qt6-multimedia qt6-charts sdl3 zlib zstd zip unzip vulkan-headers vulkan-utility-libraries libusb spirv-tools spirv-headers
 ```

 * Building with QT Web Engine requires `qt6-webengine` as well.
@@ -166,7 +165,7 @@ sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glsl
 <summary>Ubuntu, Debian, Mint Linux</summary>

 ```sh
-sudo apt-get install autoconf cmake g++ gcc git glslang-tools libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev qt6-charts-dev libvulkan-dev spirv-tools spirv-headers libusb-1.0-0-dev libxbyak-dev libboost-dev libboost-fiber-dev libboost-context-dev libsdl3-dev libopus-dev libasound2t64 vulkan-utility-libraries-dev
+sudo apt-get install autoconf cmake g++ gcc git glslang-tools libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev qt6-charts-dev libvulkan-dev spirv-tools spirv-headers libusb-1.0-0-dev libxbyak-dev libboost-dev libboost-fiber-dev libboost-context-dev libsdl3-dev libasound2t64 vulkan-utility-libraries-dev
 ```

 * Ubuntu 26.04, Linux Mint 22.3, or Debian 13 or later is required.
@@ -213,7 +212,7 @@ First, enable the community repository; [see here](https://wiki.alpinelinux.org/
 # Enable the community repository
 setup-apkrepos -c
 # Install
-apk add g++ git cmake make mesa-dev qt6-qtbase-dev qt6-qtbase-private-dev libquazip1-qt6 ffmpeg-dev qt6-charts-dev libusb-dev libtool boost-dev sdl3-dev zstd-dev vulkan-utility-libraries spirv-tools-dev openssl-dev nlohmann-json lz4-dev opus-dev jq patch
+apk add g++ git cmake make mesa-dev qt6-qtbase-dev qt6-qtbase-private-dev libquazip1-qt6 ffmpeg-dev qt6-charts-dev libusb-dev libtool boost-dev sdl3-dev zstd-dev vulkan-utility-libraries spirv-tools-dev openssl-dev nlohmann-json lz4-dev  jq patch
 ```

 </details>
@@ -261,7 +260,7 @@ brew install molten-vk

 As root run:
 ```sh
-pkg install devel/cmake devel/sdl3 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base x11-toolkits/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib graphics/vulkan-utility-libraries graphics/vulkan-headers graphics/spirv-headers quazip-qt6
+pkg install devel/cmake devel/sdl3 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base x11-toolkits/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib graphics/vulkan-utility-libraries graphics/vulkan-headers graphics/spirv-headers quazip-qt6
 ```

 If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
@@ -275,7 +274,7 @@ If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 For NetBSD +10.1:

 ```sh
-pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6-qtbase qt6-qtcharts qt6-qtmultimedia qt6-qttools cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
+pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq qt6-qtbase qt6-qtcharts qt6-qtmultimedia qt6-qttools cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
 ```

 [Caveats](./Caveats.md#netbsd).
@@ -306,7 +305,7 @@ pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmak
 <summary>OpenIndiana</summary>

 ```sh
-sudo pkg install git cmake qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl3 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
+sudo pkg install git cmake qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl sdl3 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
 ```

 [Caveats](./Caveats.md#openindiana).
@@ -330,7 +329,7 @@ sudo pkgin install git cmake autoconf build-essential libusb-1 nasm gcc13

 ```sh
 BASE="git make autoconf libtool automake-wrapper jq patch"
-MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus libusb openssl SDL3"
+MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet libusb openssl SDL3"
 # Either x86_64 or clang-aarch64 (Windows on ARM)
 packages="$BASE"
 for pkg in $MINGW; do
@@ -356,7 +355,7 @@ pacman -Syuu --needed --noconfirm $packages
 <summary>HaikuOS</summary>

 ```sh
-pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl3_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel cubeb_devel simpleini quazip_qt6_devel
+pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl3_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel cubeb_devel simpleini quazip_qt6_devel
 ```

 [Caveats](./Caveats.md#haikuos).
@@ -12,7 +12,7 @@ pkgs.mkShellNoCC {
    git cmake clang gnumake patch jq pkg-config
    # libraries
    openssl boost fmt nlohmann_json lz4 zlib zstd
-    enet libopus vulkan-headers vulkan-utility-libraries
+    enet vulkan-headers vulkan-utility-libraries
    spirv-tools spirv-headers vulkan-loader unzip
    glslang python3 httplib cpp-jwt ffmpeg-headless
    libusb1 cubeb
@@ -83,7 +83,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    SHOW_SHADERS_BUILDING("show_shaders_building"),

    DEBUG_FLUSH_BY_LINE("flush_line"),
-    EXTENDED_LOGGING("extended_logging"),
    DONT_SHOW_DRIVER_SHADER_WARNING("dont_show_driver_shader_warning"),
    ENABLE_OVERLAY("enable_overlay"),

@@ -262,13 +262,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.flush_by_line_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.EXTENDED_LOGGING,
-                    titleId = R.string.extended_logging,
-                    descriptionId = R.string.extended_logging_description
-                )
-            )

            val dockedModeSetting = object : AbstractBooleanSetting {
                override val key = BooleanSetting.USE_DOCKED_MODE.key
@@ -1323,7 +1323,6 @@ class SettingsFragmentPresenter(
                add(HeaderSetting(R.string.log))

                add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
-                add(BooleanSetting.EXTENDED_LOGGING.key)
                add(StringSetting.LOG_FILTER.key)
            }

@@ -79,13 +79,6 @@ class LicensesFragment : Fragment() {
                R.string.license_ffmpeg_copyright,
                R.string.license_ffmpeg_text
            ),
-            License(
-                R.string.license_opus,
-                R.string.license_opus_description,
-                R.string.license_opus_link,
-                R.string.license_opus_copyright,
-                R.string.license_opus_text
-            ),
            License(
                R.string.license_sirit,
                R.string.license_sirit_description,
@@ -106,7 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">محاكاة NVDEC</string>
-    <string name="nvdec_emulation_description">قم بتغيير المعالج المركزي في حالة حدوث عطل أثناء المشاهد السينمائية.</string>
+    <string name="nvdec_emulation_description">حدد كيفية التعامل مع فك تشفير الفيديو (NVDEC) خلال المشاهد التمهيدية والمقدمة.</string>
    <string name="nvdec_emulation_none">لا شيء</string>

    <!-- Optimize SPIRV output -->
@@ -292,7 +292,7 @@
    <string name="gpu_driver_manager">إدارة برامج تشغيل وحدة معالجة الرسومات</string>
    <string name="install_gpu_driver_description">تثبيت برامج تشغيل بديلة لأداء أو دقة أفضل</string>
    <string name="frame_gen">توليد الإطار</string>
-    <string name="frame_gen_per_game_description">ضبط إعدادات إنشاء الإطارات لهذه اللعبة</string>
+    <string name="frame_gen_per_game_description">تكوين إعدادات إنشاء الإطارات لهذه اللعبة</string>
    <string name="frame_gen_description">قم بإدراج الإطارات المُستكملة بين الإطارات المُعالجة باستخدام تقنية التحجيم بدون فقدان الجودة. يُفرض هذا الخيار عرض الإطارات وفقًا لترتيب FIFO عند تفعيله.</string>
    <string name="frame_gen_multiplier">مضاعف الإطارات</string>
    <string name="frame_gen_multiplier_description">عدد الإطارات المطلوب عرضها لكل إطار مُعالَج. تتطلب القيم الأعلى وقت معالجة رسوميات أكبر. طلب عدد إطارات يفوق قدرة الشاشة على عرضه سيؤدي إلى إبطاء المحاكاة.</string>
@@ -300,7 +300,6 @@
    <string name="frame_gen_multiplier_3x">3x</string>
    <string name="frame_gen_multiplier_4x">4x</string>
    <string name="frame_gen_target_rate">معدل الإطارات المستهدف</string>
-    <string name="frame_gen_target_rate_description">اختر المعدل الذي يمكن لشاشتك عرضه فعليًّا. عندئذٍ يرتفع المضاعف أو ينخفض تلقائيًّا للحفاظ على هذا المعدل، ويقوم بالتراجع عن أي خطوة تؤدي إلى إبطاء سير اللعبة نفسها.</string>
    <string name="frame_gen_target_rate_off">استخدم مضاعفًا ثابتًا</string>
    <string name="frame_gen_target_rate_60">60 إطارًا في الثانية</string>
    <string name="frame_gen_target_rate_90">90 إطارًا في الثانية</string>
@@ -308,50 +307,6 @@
    <string name="frame_gen_target_rate_144">144 إطارًا في الثانية</string>
    <string name="frame_gen_target_rate_165">165 إطارًا في الثانية</string>
    <string name="frame_gen_queue_target">هدف قائمة انتظار الإطارات</string>
-    <string name="frame_gen_queue_target_description">كم عدد الإطارات المكتملة التي قد تنتظر قبل عرضها؟ تعمل قوائم الانتظار الأكبر حجمًا على امتصاص الارتفاعات المفاجئة في حمل وحدة معالجة الرسومات على حساب زمن انتقال الإدخال.</string>
-    <string name="frame_gen_queue_target_0">أقل زمن انتقال (بدون تخزين مؤقت)</string>
-    <string name="frame_gen_queue_target_1">متوازن (1 إطار)</string>
-    <string name="frame_gen_queue_target_2">الأكثر سلاسة (2 إطارات)</string>
-    <string name="frame_gen_flow_scale_auto">تكييف تقدير الحركة مع اللعبة</string>
-    <string name="frame_gen_flow_scale_auto_description">قم بتقدير الحركة بناءً على الدقة التي تعرضها اللعبة فعليًّا، بدلاً من الإخراج الذي تم رفع دقته. ولا يؤثر ذلك على الدقة بأي شكل، لأن رفع الدقة لا يضيف أي تفاصيل تتعلق بالحركة.</string>
-    <string name="frame_gen_flow_scale">دقة تقدير الحركة</string>
-    <string name="frame_gen_flow_scale_description">دقة مسار التدفق البصري، كجزء من الناتج. ويُعد خفض هذه القيمة أرخص طريقة لاستعادة الأداء.</string>
-    <string name="frame_gen_fp16">مُظلِّلات نصف الدقة</string>
-    <string name="frame_gen_fp16_description">استخدم نسخة التظليل 16 بت. يتم التراجع تلقائيًا إلى الخيار البديل في حالة عدم توفرها في برنامج التشغيل أو الملف.</string>
-    <string name="frame_gen_dump_flow">إفراغ الإطار الذي تم إنشاؤه</string>
-    <string name="frame_gen_dump_flow_description">قم بكتابة مستويات MIP للتدفق البصري والإطار المُستكمل إلى مجلد lossless/debug مرة واحدة، لغرض استكشاف الأخطاء وإصلاحها</string>
-    <string name="frame_gen_unsupported">توليد الإطار غير متاح</string>
-    <string name="frame_gen_unsupported_description">لا يدعم برنامج تشغيل وحدة معالجة الرسومات هذا نموذج ذاكرة Vulkan، الذي تتطلبه برامج التظليل الخاصة بـ«Lossless Scaling».</string>
-    <string name="lossless_scaling_setup_description">اختياري. قم بتوفير ملف Lossless.dll الخاص بك لتمكين إنشاء الإطارات لاحقًا</string>
-    <string name="lossless_scaling_install">تثبيت ملف Lossless.dll</string>
-    <string name="lossless_scaling_install_description">يتطلب إنشاء الإطارات أن تكون لديك نسخة قانونية خاصة بك من ملف Lossless.dll المأخوذ من برنامج Lossless Scaling</string>
-    <string name="lossless_scaling_replace_description">اختر نسخة أخرى من ملف Lossless.dll</string>
-    <string name="frame_generation_support">توليد الإطارات</string>
-    <string name="frame_generation_supported">مدعوم</string>
-    <string name="frame_generation_unsupported">غير مدعوم (لا يتوفر نموذج ذاكرة Vulkan)</string>
-    <string name="lossless_scaling">Lossless Scaling</string>
-    <string name="lossless_scaling_description">قم بتوفير نسختك الخاصة من ملف Lossless.dll لتمكين توليد الإطارات</string>
-    <string name="lossless_scaling_installed">مثبت</string>
-    <string name="lossless_scaling_not_installed">غير مثبت</string>
-    <string name="lossless_scaling_replace">استبدل</string>
-    <string name="lossless_scaling_remove">إزالة</string>
-    <string name="lossless_scaling_remove_description">احذف ملف Lossless.dll المثبت ووحدات التظليل المعدة له</string>
-    <string name="lossless_scaling_remove_confirmation">سيتوقف توليد الإطارات عن العمل إلى أن تقوم بتثبيت ملف Lossless.dll مرة أخرى. ولن يتأثر ملفك الأصلي بذلك.</string>
-    <string name="lossless_scaling_missing">ملف Lossless.dll غير مثبت</string>
-    <string name="lossless_scaling_missing_description">قم بتثبيته من الإعدادات › Lossless Scaling لاستخدام ميزة توليد الإطارات.</string>
-    <string name="lossless_scaling_locked">أغلق اللعبة أولاً</string>
-    <string name="lossless_scaling_locked_description">لا يمكن تعديل ملف Lossless.dll أثناء تشغيل اللعبة.</string>
-    <string name="lossless_scaling_remove_unavailable">لا يوجد شيء يجب إزالته</string>
-    <string name="lossless_scaling_remove_unavailable_description">لم يتم تثبيت ملف Lossless.dll بعد.</string>
-    <string name="lossless_scaling_installing">جاري التحضير لإنشاء مظلّلات الإطارات…</string>
-    <string name="lossless_scaling_install_success">تم تثبيت ملف Lossless.dll بنجاح</string>
-    <string name="lossless_scaling_install_failed">تعذر تثبيت ملف Lossless.dll</string>
-    <string name="error_lossless_copy_failed">تعذر نسخ الملف المحدد.</string>
-    <string name="error_lossless_unreadable">تعذر قراءة الملف المحدد.</string>
-    <string name="error_lossless_not_pe">الملف المحدد ليس مكتبة Windows. حدد ملف Lossless.dll من تثبيت برنامج Lossless Scaling.</string>
-    <string name="error_lossless_missing_shaders">لا تحتوي هذه النسخة من ملف Lossless.dll على برامج التظليل الخاصة بتوليد الإطارات. قم بتحديث ميزة «Lossless Scaling» وحاول مرة أخرى.</string>
-    <string name="error_lossless_translation_failed">تعذر ترجمة برامج التظليل الخاصة بتوليد الإطارات. هذا الإصدار من «Lossless Scaling» غير مدعوم حتى الآن.</string>
-    <string name="error_lossless_cache_failed">تعذر كتابة برامج التظليل المترجمة إلى وحدة التخزين. تأكد من توفر مساحة خالية.</string>
    <string name="advanced_settings">الإعدادات المتقدمة</string>
    <string name="settings_description">ضبط إعدادات المحاكي</string>
    <string name="search_recently_played">تم تشغيلها مؤخرًا</string>
@@ -630,10 +585,6 @@
    <string name="log">السجلات</string>
    <string name="flush_by_line">تفريغ سجلات التصحيح حسب السطر</string>
    <string name="flush_by_line_description">يفرغ سجلات التصحيح عند كتابة كل سطر، مما يجعل التصحيح أسهل في حالات التوقف أو التجميد.</string>
-    <string name="extended_logging">تفعيل التسجيل الموسع</string>
-    <string name="extended_logging_description">يزيد الحد الأقصى لحجم ملف السجل من 100 ميجابايت إلى 1 جيجابايت.</string>
-    <string name="log_filter">مرشح السجلات</string>
-    <string name="log_filter_description">يتحكم في فئات سجلات Eden. مثال: *:Info Service.LM:Debug</string>

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">تسجيل وحدة معالجة الرسومات</string>
@@ -710,10 +661,10 @@
    <string name="gamecube_controller">ذراع تحكم GameCube</string>
    <string name="invert_axis">عكس المحور</string>
    <string name="invert_button">عكس الزر</string>
-    <string name="toggle_button">زر تفعيل/تعطيل</string>
+    <string name="toggle_button">زر تشغيل/إيقاف</string>
    <string name="turbo_button">زر التوربو</string>
    <string name="set_threshold">تعيين الحد الفاصل</string>
-    <string name="toggle_axis">تفعيل/تعطيل المحور</string>
+    <string name="toggle_axis">تشغيل/إيقاف المحور</string>
    <string name="connected">متصل</string>
    <string name="use_system_vibrator">استخدم هزاز النظام</string>
    <string name="input_overlay">طبقة الإدخال</string>
@@ -852,7 +803,7 @@
    <string name="version">الإصدار</string>
    <string name="copy_details">نسخ التفاصيل</string>
    <string name="add_ons">الإضافات</string>
-    <string name="add_ons_description">تفعيل/تعطيل التعديلات، التحديثات، المحتوى القابل للتنزيل</string>
+    <string name="add_ons_description">التعديلات، التحديثات، المحتوى القابل للتنزيل</string>
    <string name="playtime">زمن اللعب:</string>
    <string name="reset_playtime">مسح زمن اللعب</string>
    <string name="reset_playtime_description">إعادة تعيين زمن اللعب للعبة الحالية إلى 0 ثانية</string>
@@ -957,13 +908,13 @@
    <!-- Emulation Menu -->
    <string name="emulation_exit">خروج من المحاكاة</string>
    <string name="emulation_done">إنهاء</string>
-    <string name="emulation_toggle_controls">تفعيل/تعطيل أزرار التحكم</string>
+    <string name="emulation_toggle_controls">تشغيل/إيقاف أزرار التحكم</string>
    <string name="emulation_rel_stick_center">مركز العصا النسبي</string>
    <string name="emulation_dpad_slide">انزلاق الأسهم</string>
    <string name="emulation_haptics">الاهتزازات الديناميكية</string>
    <string name="emulation_show_overlay">عرض ذراع التحكم</string>
    <string name="emulation_hide_overlay">إخفاء ذراع التحكم</string>
-    <string name="emulation_toggle_all">تفعيل/تعطيل الكل</string>
+    <string name="emulation_toggle_all">تشغيل/إيقاف الكل</string>
    <string name="emulation_control_adjust">ضبط الطبقة</string>
    <string name="emulation_control_scale">الحجم</string>
    <string name="emulation_control_opacity">الشفافية</string>
@@ -1128,7 +1079,7 @@
    <string name="freedreno_info_title">حول إعدادات Freedreno</string>
    <string name="freedreno_info_description">قم بإعداد خيارات برنامج تشغيل Freedreno/Turnip لوحدة معالجة الرسومات لأغراض التصحيح، والتحليل، وتحسين الأداء. يتم حفظ التغييرات تلقائيًا. راجع https://docs.mesa3d.org/drivers/freedreno.html للحصول على الوثائق التفصيلية.</string>
    <string name="freedreno_per_game_title">إعدادات Freedreno</string>
-    <string name="freedreno_per_game_description">ضبط إعدادات برنامج تشغيل وحدة معالجة الرسومات لهذه اللعبة</string>
+    <string name="freedreno_per_game_description">قم بضبط إعدادات برنامج تشغيل وحدة معالجة الرسومات لهذه اللعبة</string>
    <string name="freedreno_per_game_saved">تم حفظ إعدادات Freedreno</string>

    <!-- Gamepad Buttons -->
@@ -1156,6 +1107,7 @@
    <string name="theme_mode_light">فاتح</string>
    <string name="theme_mode_dark">داكن</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">خلفيات سوداء</string>
    <string name="use_black_backgrounds_description">عند استخدام السمة الداكنة، قم بتطبيق خلفيات سوداء.</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">ئەم باشکردنە خێرایی دەستکەوتنی بیرگە لەلایەن پرۆگرامی میوانەکە زیاد دەکات. چالاککردنی وای لێدەکات کە خوێندنەوە/نووسینەکانی بیرگەی میوانەکە ڕاستەوخۆ لە بیرگە ئەنجام بدرێت و میمیکردنی MMU میواندە بەکاربهێنێت. ناچالاککردنی ئەمە هەموو دەستکەوتنەکانی بیرگە ڕەت دەکاتەوە لە بەکارهێنانی میمیکردنی MMU نەرمەکاڵا.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">ئیمولەیشنی NVDEC</string>
+    <string name="nvdec_emulation_description">هەڵبژاردنی ڕێگای دیکۆدکردنی ڤیدیۆ</string>
    <string name="nvdec_emulation_none">هیچ</string>

    <!-- Optimize SPIRV output -->
@@ -378,6 +379,7 @@
    <string name="log">تۆمارکردن</string>
    <string name="flush_by_line">خاوکردنەوەی تۆمارەکانی دیباگ بە هێڵ</string>
    <string name="flush_by_line_description">تۆمارەکانی دیباگ لە هەر هێڵێکدا دەنوسرێت خاو دەکاتەوە، ئەمە وا دەکات دیباگکردن ئاسانتر بێت لە کاتی کرشکردن یان پێکەنین.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">بزوێنری دەرچوونی دەنگ</string>
    <string name="audio_volume">دەنگ</string>
@@ -97,6 +97,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulace NVDEC</string>
+    <string name="nvdec_emulation_description">Určuje, jakým způsobem se zpracovává dekódování videa (NVDEC).</string>
    <string name="nvdec_emulation_none">Žádné</string>

    <!-- Optimize SPIRV output -->
@@ -495,6 +496,7 @@
    <string name="log">Protokolování</string>
    <string name="flush_by_line">Vypisovat ladicí záznamy po řádcích</string>
    <string name="flush_by_line_description">Vypisuje ladicí záznamy po každém napsaném řádku, což usnadňuje ladění v případě pádu nebo zamrznutí.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Výstupní engine</string>
    <string name="audio_volume">Hlasitost</string>
@@ -64,8 +64,8 @@
    <string name="bat_temperature_unit">Batterietemperatur-Einheiten</string>
    <string name="show_power_info">Batterieinfo anzeigen</string>
    <string name="show_power_info_description">Aktuellen Stromverbrauch und verbleibende Kapazität der Batterie anzeigen</string>
-    <string name="show_shaders_building">Shader-Erstellung anzeigen</string>
-    <string name="show_shaders_building_description">Aktuelle Anzahl der erstellten Shader anzeigen</string>
+    <string name="show_shaders_building">Schattierer-Erstellung anzeigen</string>
+    <string name="show_shaders_building_description">Aktuelle Anzahl der erstellten Schattierer anzeigen</string>
    <string name="pipeline_worker_cores_description">Lege die Anzahl der Kerne fest, die für die Erstellung von Vulkan-Rohrleitungen verwendet werden sollen. Ein höherer Wert verbessert die Kompilierungsleistung der Rohrleitung, führt jedoch auch zu einem Anstieg der Temperaturen.</string>
    <string name="overlay_position">Überlagerungs-Position</string>
    <string name="overlay_position_description">Wähle aus, wo die Überlagerung auf dem Bildschirm angezeigt wird</string>
@@ -105,7 +105,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC-Emulation</string>
-    <string name="nvdec_emulation_description">Wechsle auf CPU, falls ein Absturz bei einem Cinematic auftritt.</string>
+    <string name="nvdec_emulation_description">Wähle aus, wie die Videodekodierung (NVDEC) während Zwischensequenzen und Intros gehandhabt wird.</string>
    <string name="nvdec_emulation_none">Keine</string>

    <!-- Optimize SPIRV output -->
@@ -290,38 +290,6 @@
    <string name="gpu_driver_fetcher">GPU-Treiber-Hersteller</string>
    <string name="gpu_driver_manager">GPU-Treiber Verwaltung</string>
    <string name="install_gpu_driver_description">Alternative Treiber für eventuell bessere Leistung oder Genauigkeit installieren</string>
-    <string name="frame_gen">Frame-Generation</string>
-    <string name="frame_gen_per_game_description">Konfiguriere Frame-Generation für dieses Spiel</string>
-    <string name="frame_gen_description">Füge zwischen den gerenderten Bildern interpolierte Bilder mithilfe von Lossless Scaling ein. </string>
-    <string name="frame_gen_multiplier">Frame-Multiplikator</string>
-    <string name="frame_gen_multiplier_description">Wie viele Bilder für jedes gerenderte angezeigt werden soll. Höhere Werte kosten proportional mehr GPU-Zeit. Nach mehr zu fragen, als dein Bildschirm darstellen kann, wird die Emulation verlangsamen.</string>
-    <string name="frame_gen_multiplier_2x">2x</string>
-    <string name="frame_gen_multiplier_3x">3x</string>
-    <string name="frame_gen_multiplier_4x">4x</string>
-    <string name="frame_gen_target_rate">Ziel-Bildrate</string>
-    <string name="frame_gen_target_rate_description">Wähle die Rate aus die dein Bildschirm tatsächlich darstellen kann. Der Multiplikator steigt oder fällt dann alleine um sie zu halten, und rollt jeden Schritt zurück, der das Spiel selber langsamer macht.</string>
-    <string name="frame_gen_target_rate_off">Nutze einen fixierten Multiplikator</string>
-    <string name="frame_gen_target_rate_60">60 FPS</string>
-    <string name="frame_gen_target_rate_90">90 FPS</string>
-    <string name="frame_gen_target_rate_120">120 FPS</string>
-    <string name="frame_gen_target_rate_144">144 FPS</string>
-    <string name="frame_gen_target_rate_165">165 FPS</string>
-    <string name="frame_gen_queue_target_1">Ausbalanciert (1 Bild)</string>
-    <string name="frame_gen_queue_target_2">Flüssigste (2 Bilder)</string>
-    <string name="frame_gen_unsupported">Frame-Generation nicht verfügbar</string>
-    <string name="frame_gen_unsupported_description">Dieser GPU-Treiber unterstützt das Vulkan-Memory-Model nicht, welches Lossless Scaling-Shader benötigen.</string>
-    <string name="lossless_scaling_setup_description">Optional. Stelle deine eigene Lossless.dll zur Verfügung, um Frame-Generation später zu aktivieren.</string>
-    <string name="lossless_scaling_install">Installiere Lossless.dll</string>
-    <string name="lossless_scaling_replace_description">Wähle eine andere Kopie von Lossless.dll</string>
-    <string name="frame_generation_supported">Unterstützt</string>
-    <string name="frame_generation_unsupported">Nicht unterstützt (kein Vulkan-Memory-Model)</string>
-    <string name="lossless_scaling">Lossless Scaling</string>
-    <string name="lossless_scaling_installed">Installiert</string>
-    <string name="lossless_scaling_not_installed">Nicht installiert</string>
-    <string name="lossless_scaling_replace">Ersetzen</string>
-    <string name="lossless_scaling_remove">Entfernen</string>
-    <string name="lossless_scaling_locked">Schließe zuerst das Spiel</string>
-    <string name="lossless_scaling_remove_unavailable">Nichts zum Entfernen</string>
    <string name="advanced_settings">Erweiterte Einstellungen</string>
    <string name="settings_description">Emulatoreinstellungen konfigurieren</string>
    <string name="search_recently_played">Kürzlich gespielt</string>
@@ -426,7 +394,6 @@ Wirklich fortfahren?</string>
    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
    <string name="about_app_description">Ein quelloffener Switch-Emulator</string>
    <string name="contributors">Beitragende</string>
-    <string name="contributors_description">Personen, die Eden für Android möglich gemacht haben</string>
    <string name="licenses_description">Projekte, die Eden für Android möglich machen </string>
    <string name="build">Build</string>
    <string name="user_data">Nutzerdaten</string>
@@ -462,8 +429,6 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="use_custom_rtc_description">Ermöglicht Ihnen, eine benutzerdefinierte Echtzeituhr unabhängig von Ihrer aktuellen Systemzeit einzustellen.</string>
    <string name="set_custom_rtc">Legen Sie eine benutzerdefinierte Echtzeituhr fest</string>

-    <!-- CPU -->
-    <string name="fast_cpu_time">CPU-Takte</string>
    <string name="custom_cpu_ticks">Benutzerdefinierte CPU-Ticks</string>
    <string name="custom_cpu_ticks_description">Legen Sie einen benutzerdefinierten Wert für CPU-Ticks fest. Höhere Werte können die Leistung steigern, aber auch zum Einfrieren des Spiels führen. Ein Bereich von 77–21000 wird empfohlen.</string>
    <string name="cpu_ticks">Ticks</string>
@@ -508,14 +473,10 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="renderer_reactive_flushing_description">Verbessert die Genauigkeit in einigen Spielen.</string>
    <string name="hacks">Hacks</string>

-    <string name="fast_gpu_time">GPU-Takte</string>
    <string name="skip_cpu_inner_invalidation">CPU-interne Invalidierung überspringen</string>
    <string name="skip_cpu_inner_invalidation_description">Überspringt bestimmte Cache-Invalidierungen auf CPU-Seite während Speicherupdates, reduziert die CPU-Auslastung und verbessert die Leistung. Kann in einigen Spielen zu Fehlern oder Abstürzen führen.</string>
    <string name="renderer_asynchronous_shaders">Asynchrone Shader</string>
    <string name="renderer_asynchronous_shaders_description">Kompiliert Shader asynchron. Dies kann Ruckler reduzieren, aber auch Grafikfehler verursachen.</string>
-    <string name="gpu_unswizzle_default_button">Standard</string>
-
-
    <string name="extensions">Erweiterungen</string>

    <string name="dyna_state">Erweiterter dynamischer Status</string>
@@ -537,7 +498,6 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die

    <!-- Debug settings strings -->
    <string name="cpu">CPU</string>
-    <string name="clocks">Takte</string>
    <string name="use_auto_stub">Auto-Stub verwenden</string>
    <string name="use_auto_stub_description">Ergänzt automatisch fehlende Dienste und Funktionen. Kann die Kompatibilität verbessern, aber auch zu Abstürzen und Stabilitätsproblemen führen.</string>

@@ -552,6 +512,7 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="log">Protokollierung</string>
    <string name="flush_by_line">Debug-Protokolle zeilenweise leeren</string>
    <string name="flush_by_line_description">Leert Debug-Protokolle bei jeder geschriebenen Zeile, was das Debuggen bei Abstürzen oder Einfrieren erleichtert.</string>
+
    <string name="general">Allgemein</string>

    <!-- Audio settings strings -->
@@ -792,7 +753,6 @@ Wirklich fortfahren?</string>
    <string name="confirm_uninstall">Bestätigen Sie die Deinstallation</string>
    <string name="confirm_uninstall_description">Möchten Sie dieses Add-on wirklich deinstallieren\?</string>
    <string name="verify_integrity">Integrität prüfen</string>
-    <string name="verifying">Verifiziere...</string>
    <string name="verify_success">Integritätsüberprüfung erfolgreich!</string>
    <string name="verify_failure">Integritätsüberprüfung fehlgeschlagen!</string>
    <string name="verify_failure_description">Der Dateiinhalt ist möglicherweise beschädigt</string>
@@ -914,16 +874,6 @@ Wirklich fortfahren?</string>
    <string name="memory_6gb">6 GB (Unsicher)</string>
    <string name="memory_8gb">8 GB (Unsicher)</string>

-    <!-- CPU clock levels -->
-    <string name="clock_normal">Normal</string>
-    <string name="clock_boost">Beschleunigung</string>
-    <string name="clock_fast">Übertaktung</string>
-
-    <!-- GPU clock levels -->
-    <string name="fast_gpu_normal">Normal</string>
-    <string name="fast_gpu_medium">Beschleunigung</string>
-    <string name="fast_gpu_high">Übertaktung</string>
-
    <!-- GPU swizzle texture size -->
    <string name="gpu_texturesizeswizzle_verysmall">Sehr klein (16 MB)</string>
    <string name="gpu_texturesizeswizzle_small">Klein (32 MB)</string>
@@ -969,13 +919,6 @@ Wirklich fortfahren?</string>
    <string name="dma_accuracy_unsafe">Unsicher</string>
    <string name="dma_accuracy_safe">Sicher</string>

-    <!-- GPU Fence Behavior -->
-    <string name="gpu_fence_behavior_default">Standard</string>
-    <string name="gpu_fence_behavior_immediate">Direkt</string>
-    <string name="gpu_fence_behavior_balanced">Ausgewogen</string>
-    <string name="gpu_fence_behavior_accurate">Genau</string>
-    <string name="gpu_fence_behavior_strict">Strikt</string>
-
    <string name="vram_usage_conservative">Konservativ</string>
    <string name="vram_usage_aggressive">Aggressiv</string>

@@ -1042,32 +985,27 @@ Wirklich fortfahren?</string>
    <string name="theme_material_you">Material You</string>
    <string name="app_settings">App-Einstellungen</string>
    <string name="theme_and_color">Theme und Farben</string>
-    <string name="fullscreen_mode">Vollbild-Modus</string>
    <!-- Theme Modes -->
    <string name="change_theme_mode">Design</string>
    <string name="theme_mode_follow_system">System folgen</string>
    <string name="theme_mode_light">Hell</string>
    <string name="theme_mode_dark">Dunkel</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Schwarze Hintergründe</string>
    <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Designs, schwarze Hintergründe verwenden.</string>

-    <!-- Buttons -->
-    <string name="enable_folder_button">Ordner</string>
-    <string name="enable_qlaunch_button">QLaunch</string>
    <!-- App Language -->
    <string name="app_language">App-Sprache</string>
    <string name="app_language_description">Sprache der App-Oberfläche ändern</string>
    <string name="app_language_system">System folgen</string>
    <!-- Static Themes -->
    <string name="static_theme_color">Designfarbe</string>
-    <string name="eden_theme">Eden</string>
    <string name="violet">Violett </string>
    <string name="blue">Blau</string>
    <string name="cyan">Cyan</string>
    <string name="red">Rot</string>
-    <string name="green">Grün</string>
    <string name="yellow">Gelb</string>
    <string name="orange">Orange</string>
    <string name="pink">Rosa</string>
@@ -1099,10 +1037,6 @@ Wirklich fortfahren?</string>
    <string name="enable_overlay">Applet-Overlay aktivieren</string>
    <string name="enable_overlay_description">Aktiviert Horizons eingebautes Overlay-Applet. Halte die Home-Taste eine Sekunde lang gedrückt, um es anzuzeigen.</string>

-    <!-- Profile Management -->
-    <string name="profile_manager">Nutzerverwaltung</string>
-    <string name="error">Fehler</string>
-
    <!-- Licenses screen strings -->
    <string name="licenses">Lizenzen</string>
    <string name="license_fidelityfx_fsr_description">Hochwertiges Upscaling von AMD</string>
@@ -106,6 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulación NVDEC</string>
+    <string name="nvdec_emulation_description">Seleccione cómo se maneja la decodificación de vídeo (NVDEC) durante las escenas y las introducciones.</string>
    <string name="nvdec_emulation_none">Ninguno</string>

    <!-- Optimize SPIRV output -->
@@ -291,41 +292,22 @@
    <string name="gpu_driver_manager">Gestor de controladores de la GPU</string>
    <string name="install_gpu_driver_description">Instale los controladores alternativos para obtener un posible mejor rendimiento o precisión</string>
    <string name="frame_gen">Generación de fotograma</string>
-    <string name="frame_gen_per_game_description">Configurar la generación de fotogramas para este juego</string>
    <string name="frame_gen_multiplier">Multiplicador de fotograma</string>
    <string name="frame_gen_multiplier_2x">2x</string>
    <string name="frame_gen_multiplier_3x">3x</string>
    <string name="frame_gen_multiplier_4x">4x</string>
-    <string name="frame_gen_target_rate">Objetivo de tasa de fotogramas</string>
-    <string name="frame_gen_target_rate_off">Usar un multiplicador fijo</string>
    <string name="frame_gen_target_rate_60">60 FPS</string>
    <string name="frame_gen_target_rate_90">90 FPS</string>
    <string name="frame_gen_target_rate_120">120 FPS</string>
    <string name="frame_gen_target_rate_144">144 FPS</string>
    <string name="frame_gen_target_rate_165">165 FPS</string>
-    <string name="frame_gen_queue_target_0">Latencia más baja (Sin búfer)</string>
    <string name="frame_gen_queue_target_1">Equilibrado (1 fotograma)</string>
-    <string name="frame_gen_queue_target_2">Más suave (2 fotogramas)</string>
-    <string name="frame_gen_fp16">Sombreadores de media precisión</string>
-    <string name="frame_gen_unsupported">Generación de fotogramas no disponbile</string>
-    <string name="lossless_scaling_install">Instalar Lossless.dll</string>
-    <string name="lossless_scaling_replace_description">Seleccionar una copia diferente de Lossless.dll</string>
    <string name="frame_generation_support">Generación de fotograma</string>
    <string name="frame_generation_supported">Soportado</string>
-    <string name="frame_generation_unsupported">No soportado (sin modelo de memoria de Vulkan)</string>
    <string name="lossless_scaling">Escalado sin pérdidas</string>
    <string name="lossless_scaling_installed">Instalado</string>
    <string name="lossless_scaling_not_installed">No instalado</string>
-    <string name="lossless_scaling_replace">Reemplazar</string>
-    <string name="lossless_scaling_remove">Borrar</string>
-    <string name="lossless_scaling_remove_description">Borrar Lossless.dll instalado y sus sombreadores preparados</string>
    <string name="lossless_scaling_missing">Lossless.dll no instalado</string>
-    <string name="lossless_scaling_locked">Primero cierra el juego</string>
-    <string name="lossless_scaling_remove_unavailable">Nada que borrar</string>
-    <string name="lossless_scaling_install_success">Lossless.dll instalado correctamente</string>
-    <string name="lossless_scaling_install_failed">No se pudo instalar Lossless.dll</string>
-    <string name="error_lossless_copy_failed">No se pudo copiar el archivo seleccionado.</string>
-    <string name="error_lossless_unreadable">No se pudo leer el archivo seleccionado.</string>
    <string name="advanced_settings">Ajustes avanzados</string>
    <string name="settings_description">Configurar los ajustes del emulador</string>
    <string name="search_recently_played">Jugado recientemente</string>
@@ -472,8 +454,6 @@
    <string name="use_custom_rtc_description">Le permite tener un reloj personalizado en tiempo real diferente de la hora de su sistema.</string>
    <string name="set_custom_rtc">Configurar RTC personalizado</string>

-    <!-- CPU -->
-    <string name="fast_cpu_time">Relojes de la CPU</string>
    <string name="custom_cpu_ticks">Ticks de CPU personalizados</string>
    <string name="custom_cpu_ticks_description">Establezca un valor personalizado de los ciclos de la CPU. Los valores más altos pueden aumentar el rendimiento, pero también pueden hacer que el juego se congele. Se recomienda un rango de 77–21000.</string>
    <string name="cpu_ticks">Ciclos</string>
@@ -532,7 +512,6 @@

    <string name="hacks">Hacks</string>

-    <string name="fast_gpu_time">Relojes de la GPU</string>
    <string name="skip_cpu_inner_invalidation">Omitir invalidación interna de la CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Omite ciertas invalidaciones de caché de la CPU durante las actualizaciones de memoria, lo que reduce el uso de la CPU y mejora su rendimiento. Esto puede causar fallos o bloqueos en algunos juegos.</string>
    <string name="fix_bloom_effects">Arreglar los efectos de resplandor</string>
@@ -579,7 +558,6 @@

    <!-- Debug settings strings -->
    <string name="cpu">CPU</string>
-    <string name="clocks">Relojes</string>
    <string name="use_auto_stub">Usar Auto Stub</string>
    <string name="use_auto_stub_description">Rellena automáticamente servicios y funciones ausentes. Puede mejorar la compatibilidad pero puede causar cierres inesperados.</string>

@@ -594,8 +572,6 @@
    <string name="log">Registro</string>
    <string name="flush_by_line">Vaciar los registros de depuración por línea</string>
    <string name="flush_by_line_description">Vacía los registros de depuración en cada línea escrita, facilitando la depuración en casos de bloqueos o congelamientos.</string>
-    <string name="log_filter">Filtro de registros</string>
-    <string name="log_filter_description">Controla las categorias de registros de Eden. Por ejemplo: *:Info Service.LM:Debug</string>

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Registros de la GPU</string>
@@ -983,12 +959,10 @@

    <!-- CPU clock levels -->
    <string name="clock_normal">Normal</string>
-    <string name="clock_boost">Impulso</string>
    <string name="clock_fast">Overclock</string>

    <!-- GPU clock levels -->
    <string name="fast_gpu_normal">Normal</string>
-    <string name="fast_gpu_medium">Impulso</string>
    <string name="fast_gpu_high">Overclock</string>

    <!-- GPU swizzle texture size -->
@@ -1118,6 +1092,7 @@
    <string name="theme_mode_light">Claro</string>
    <string name="theme_mode_dark">Oscuro</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Fondos oscuros</string>
    <string name="use_black_backgrounds_description">Cuando se usa el modo oscuro, aplicar fondos de pantalla negros.</string>
@@ -104,6 +104,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Émulation NVDEC</string>
+    <string name="nvdec_emulation_description">Sélectionnez la manière dont le décodage vidéo (NVDEC) est géré pendant les cinématiques et les intros.</string>
    <string name="nvdec_emulation_none">Aucun</string>

    <!-- Optimize SPIRV output -->
@@ -517,6 +518,7 @@
    <string name="log">Journalisation</string>
    <string name="flush_by_line">Vider les journaux de débogage ligne par ligne</string>
    <string name="flush_by_line_description">Vide les journaux de débogage à chaque ligne écrite, facilitant le débogage en cas de plantage ou de gel.</string>
+
    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Journalisation GPU</string>
    <string name="gpu_log_level">Niveau de journalisation</string>
@@ -1002,6 +1004,7 @@
    <string name="theme_mode_light">Lumineux</string>
    <string name="theme_mode_dark">Sombre</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Arrière-plan noir</string>
    <string name="use_black_backgrounds_description">Lorsque vous utilisez le thème sombre, appliquer un arrière-plan noir.</string>
@@ -67,6 +67,7 @@
    <string name="debug_knobs_description">לשימוש בפיתוח בלבד.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">אמולציית NVDEC</string>
+    <string name="nvdec_emulation_description">בחר כיצד לטפל בפענוח וידאו</string>
    <string name="nvdec_emulation_none">ללא</string>

    <!-- Optimize SPIRV output -->
@@ -407,6 +408,7 @@
    <string name="log">רישום</string>
    <string name="flush_by_line">רוקן יומני ניפוי שגיאות לפי שורה</string>
    <string name="flush_by_line_description">מרוקן יומני ניפוי שגיאות בכל שורה שנכתבת, מה שמקל על ניפוי שגיאות במקרים של קריסה או קיפאון.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">מנוע פלט</string>
    <string name="audio_volume">עוצמת שמע</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Ez az optimalizáció gyorsítja a vendégprogram memória-hozzáférését. Engedélyezése esetén a vendég memóriaolvasási/írási műveletei közvetlenül a memóriában történnek, és kihasználják a gazda MMU-ját. Letiltás esetén minden memória-hozzáférés a szoftveres MMU emulációt használja.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC emuláció</string>
+    <string name="nvdec_emulation_description">Videódekódolás kezelése</string>
    <string name="nvdec_emulation_none">Nincs</string>

    <!-- Optimize SPIRV output -->
@@ -395,6 +396,7 @@
    <string name="log">Naplózás</string>
    <string name="flush_by_line">Hibakeresési naplók soronkénti kiürítése</string>
    <string name="flush_by_line_description">Kiüríti a hibakeresési naplókat minden írt sor után, megkönnyítve a hibakeresést összeomlás vagy fagyás esetén.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Kimeneti motor</string>
    <string name="audio_volume">Hangerő</string>
@@ -81,6 +81,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Optimasi ini mempercepat akses memori oleh program tamu. Mengaktifkannya menyebabkan pembacaan/penulisan memori tamu dilakukan langsung ke memori dan memanfaatkan MMU Host. Menonaktifkan ini memaksa semua akses memori menggunakan Emulasi MMU Perangkat Lunak.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulasi NVDEC</string>
+    <string name="nvdec_emulation_description">Pilih cara decoding video (NVDEC) ditangani selama cutscene dan intro.</string>
    <string name="nvdec_emulation_none">Tidak Ada</string>

    <!-- Optimize SPIRV output -->
@@ -429,6 +430,7 @@
    <string name="log">Pencatatan</string>
    <string name="flush_by_line">Buang log debug per baris</string>
    <string name="flush_by_line_description">Membuang log debug pada setiap baris yang ditulis, memudahkan debugging dalam kasus crash atau freeze.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Output audio</string>
    <string name="audio_volume">Volume</string>
@@ -79,6 +79,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Questa ottimizzazione accelera gli accessi alla memoria da parte del programma guest. Abilitandola, le letture/scritture della memoria guest vengono eseguite direttamente in memoria e sfruttano la MMU host. Disabilitandola, tutti gli accessi alla memoria sono costretti a utilizzare l\'emulazione software della MMU.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulazione NVDEC</string>
+    <string name="nvdec_emulation_description">Scegli come gestire la decodifica video</string>
    <string name="nvdec_emulation_none">Nessuna</string>

    <!-- Optimize SPIRV output -->
@@ -436,6 +437,7 @@
    <string name="log">Registrazione</string>
    <string name="flush_by_line">Svuota i log di debug per riga</string>
    <string name="flush_by_line_description">Svuota i log di debug su ogni riga scritta, facilitando il debug in caso di crash o blocco.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Motore di Output</string>
    <string name="audio_volume">Volume</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">この最適化により、ゲストプログラムによるメモリアクセスが高速化されます。有効にすると、ゲストのメモリ読み書きが直接メモリ内で実行され、ホストのMMUを利用します。無効にすると、すべてのメモリアクセスでソフトウェアMMUエミュレーションが使用されます。</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDECエミュレーション</string>
+    <string name="nvdec_emulation_description">ビデオデコード方法</string>
    <string name="nvdec_emulation_none">無効</string>

    <!-- Optimize SPIRV output -->
@@ -397,6 +398,7 @@
    <string name="log">ロギング</string>
    <string name="flush_by_line">デバッグログを行ごとにフラッシュ</string>
    <string name="flush_by_line_description">デバッグログを行ごとにフラッシュし、クラッシュやフリーズ時のデバッグを容易にします。</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">出力エンジン</string>
    <string name="audio_volume">音量</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">이 최적화는 게스트 프로그램의 메모리 접근 속도를 높입니다. 활성화하면 게스트의 메모리 읽기/쓰기가 메모리에서 직접 수행되고 호스트의 MMU를 활용합니다. 비활성화하면 모든 메모리 접근에 소프트웨어 MMU 에뮬레이션을 사용하게 됩니다.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC 에뮬레이션</string>
+    <string name="nvdec_emulation_description">비디오 디코딩 처리 방식 선택</string>
    <string name="nvdec_emulation_none">없음</string>

    <!-- Optimize SPIRV output -->
@@ -397,6 +398,7 @@
    <string name="log">로깅</string>
    <string name="flush_by_line">디버그 로그를 줄별로 플러시</string>
    <string name="flush_by_line_description">디버그 로그를 각 줄마다 플러시하여 충돌 또는 정지 시 디버깅을 용이하게 합니다.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">출력 엔진</string>
    <string name="audio_volume">볼륨</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Denne optimaliseringen fremskynder minnetilgang av gjesteprogrammet. Hvis aktivert, utføres gjestens minnelesing/skriving direkte i minnet og bruker vertens MMU. Deaktivering tvinger alle minnetilganger til å bruke programvarebasert MMU-emulering.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC-emulering</string>
+    <string name="nvdec_emulation_description">Velg hvordan videodekoding håndteres</string>
    <string name="nvdec_emulation_none">Ingen</string>

    <!-- Optimize SPIRV output -->
@@ -378,6 +379,7 @@
    <string name="log">Logging</string>
    <string name="flush_by_line">Tøm feilsøkingslogger per linje</string>
    <string name="flush_by_line_description">Tømmer feilsøkingslogger for hver linje som skrives, noe som gjør feilsøking enklere ved krasj eller frysing.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Lydmotor</string>
    <string name="audio_volume">Volum</string>
@@ -97,6 +97,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulacja NVDEC</string>
+    <string name="nvdec_emulation_description">Wybierz metodę dekodowania wideo (NVDEC).</string>
    <string name="nvdec_emulation_none">Brak</string>

    <!-- Optimize SPIRV output -->
@@ -499,6 +500,7 @@
    <string name="log">Rejestrowanie</string>
    <string name="flush_by_line">Opróżniaj dzienniki debugowania linia po linii</string>
    <string name="flush_by_line_description">Opróżnia dzienniki debugowania po każdej napisanej linii, ułatwiając debugowanie w przypadku awarii lub zawieszenia.</string>
+
    <string name="general">Ogólne</string>

    <!-- Audio settings strings -->
@@ -933,6 +935,7 @@
    <string name="theme_mode_light">Jasny</string>
    <string name="theme_mode_dark">Ciemny</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Czarne tła</string>
    <string name="use_black_backgrounds_description">Kiedy używany ciemny motyw, tła zostają zastąpione czernią.</string>
@@ -91,6 +91,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Decodificação de Vídeo (NVDEC)</string>
+    <string name="nvdec_emulation_description">Selecione como a decodificação de vídeo é realizada durante cutscenes e intros.</string>
    <string name="nvdec_emulation_none">Nenhum</string>

    <!-- Optimize SPIRV output -->
@@ -482,6 +483,7 @@
    <string name="log">Registro</string>
    <string name="flush_by_line">Liberar logs de depuração por linha</string>
    <string name="flush_by_line_description">Libera logs de depuração em cada linha escrita, facilitando a depuração em casos de travamento ou congelamento.</string>
+
    <string name="general">Geral</string>

    <!-- Audio settings strings -->
@@ -889,6 +891,7 @@
    <string name="theme_mode_light">Claro</string>
    <string name="theme_mode_dark">Escuro</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Planos de fundo pretos</string>
    <string name="use_black_backgrounds_description">Quando usar o tema escuro, aplicar fundos pretos</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Esta otimização acelera os acessos à memória pelo programa convidado. Ativar faz com que as leituras/escritas de memória do convidado sejam efetuadas diretamente na memória e utilizem a MMU do Anfitrião. Desativar força todos os acessos à memória a usar a Emulação de MMU por Software.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Emulação NVDEC</string>
+    <string name="nvdec_emulation_description">Método de decodificação de vídeo.</string>
    <string name="nvdec_emulation_none">Nenhum</string>

    <!-- Optimize SPIRV output -->
@@ -401,6 +402,7 @@
    <string name="log">Registo</string>
    <string name="flush_by_line">Libertar registos de depuração por linha</string>
    <string name="flush_by_line_description">Liberta registos de depuração em cada linha escrita, facilitando a depuração em casos de falha ou congelamento.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Motor de saída</string>
    <string name="audio_volume">Volume</string>
@@ -106,7 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Эмуляция NVDEC</string>
-    <string name="nvdec_emulation_description">Переключите на CPU, если происходит вылет на кат-сценах.</string>
+    <string name="nvdec_emulation_description">Обработка видео (ролики, интро)</string>
    <string name="nvdec_emulation_none">Отключено</string>

    <!-- Optimize SPIRV output -->
@@ -291,58 +291,6 @@
    <string name="gpu_driver_fetcher">Получение драйверов ГПУ</string>
    <string name="gpu_driver_manager">Менеджер драйверов ГПУ</string>
    <string name="install_gpu_driver_description">Установите альтернативные драйверы для потенциально лучшей производительности и/или точности</string>
-    <string name="frame_gen">Генерация кадров</string>
-    <string name="frame_gen_per_game_description">Настройка генерации кадров для данной игры</string>
-    <string name="frame_gen_description">Вставляет промежуточные кадры между отрендеренными с помощью Lossless Scaling. При включении принудительно устанавливает режим вывода FIFO.</string>
-    <string name="frame_gen_multiplier">Множитель кадров</string>
-    <string name="frame_gen_multiplier_description">Количество кадров, отображаемых на каждый отрисованный кадр. Повышение значения пропорционально увеличивает затраты ресурсов ГПУ. Если запрашивать больше, чем может отобразить ваш экран, эмуляция будет замедляться.</string>
-    <string name="frame_gen_target_rate">Целевая частота кадров</string>
-    <string name="frame_gen_target_rate_description">Выберите значение под ваш дисплей. Множитель подстроится сам, чтобы его держать, и откатит изменения, если игра начнёт тормозить.</string>
-    <string name="frame_gen_target_rate_off">Использовать фиксированный множитель</string>
-    <string name="frame_gen_queue_target">Целевой размер очереди кадров</string>
-    <string name="frame_gen_queue_target_description">Сколько готовых кадров может ожидать перед выводом на экран. Более длинные очереди сглаживают скачки ГПУ ценой задержки ввода.</string>
-    <string name="frame_gen_queue_target_0">Минимальная задержка (Без буферизации)</string>
-    <string name="frame_gen_queue_target_1">Сбалансированный (1 кадр)</string>
-    <string name="frame_gen_queue_target_2">Наиболее плавный (2 кадра)</string>
-    <string name="frame_gen_flow_scale_auto">Подстроить оценку движения под игру</string>
-    <string name="frame_gen_flow_scale_auto_description">Оценивать движение в разрешении, которое игра действительно рендерит, вместо масштабированного вывода. Ничего не стоит в точности, так как масштабирование не добавляет деталей движения.</string>
-    <string name="frame_gen_flow_scale">Разрешение оценки движения</string>
-    <string name="frame_gen_flow_scale_description">Разрешение прохода оптического потока в долях от выходного разрешения. Его понижение — самый дешёвый способ вернуть производительность.</string>
-    <string name="frame_gen_fp16">Шейдеры половинной точности</string>
-    <string name="frame_gen_fp16_description">Использовать 16-битную версию шейдеров. Автоматически переключается на обычную, если драйвер или файл не поддерживают её.</string>
-    <string name="frame_gen_dump_flow">Сохранить сгенерированный кадр</string>
-    <string name="frame_gen_dump_flow_description">Однократно записать уровни мип-карт оптического потока и интерполированный кадр в папку lossless/debug для диагностики.</string>
-    <string name="frame_gen_unsupported">Генерация кадров недоступна</string>
-    <string name="frame_gen_unsupported_description">Драйвер ГПУ не поддерживает модель памяти Vulkan, требуемую шейдерами Lossless Scaling.</string>
-    <string name="lossless_scaling_setup_description">Опционально. Укажите свой Lossless.dll для включения генерации кадров позже.</string>
-    <string name="lossless_scaling_install">Установить Lossless.dll</string>
-    <string name="lossless_scaling_install_description">Для генерации кадров требуется ваша собственная легальная копия Lossless.dll из Lossless Scaling</string>
-    <string name="lossless_scaling_replace_description">Выбрать другой файл Lossless.dll</string>
-    <string name="frame_generation_support">Генерация кадров</string>
-    <string name="frame_generation_supported">Поддерживается</string>
-    <string name="frame_generation_unsupported">Не поддерживается (нет модели памяти Vulkan)</string>
-    <string name="lossless_scaling_description">Предоставьте свою копию Lossless.dll для включения генерации кадров</string>
-    <string name="lossless_scaling_installed">Установлена</string>
-    <string name="lossless_scaling_not_installed">Не установлена</string>
-    <string name="lossless_scaling_replace">Заменить</string>
-    <string name="lossless_scaling_remove">Удалить</string>
-    <string name="lossless_scaling_remove_description">Удалить установленный Lossless.dll и его подготовленные шейдеры</string>
-    <string name="lossless_scaling_remove_confirmation">Генерация кадров перестанет работать, пока вы снова не установите Lossless.dll. Ваш исходный файл не пострадает.</string>
-    <string name="lossless_scaling_missing">Lossless.dll не установлен</string>
-    <string name="lossless_scaling_missing_description">Установите его через Настройки › Lossless Scaling для использования генерации кадров.</string>
-    <string name="lossless_scaling_locked">Сначала закройте игру</string>
-    <string name="lossless_scaling_locked_description">Lossless.dll нельзя изменить, пока запущена игра.</string>
-    <string name="lossless_scaling_remove_unavailable">Нечего удалять.</string>
-    <string name="lossless_scaling_remove_unavailable_description">Lossless.dll ещё не установлен.</string>
-    <string name="lossless_scaling_installing">Подготовка шейдеров генерации кадров…</string>
-    <string name="lossless_scaling_install_success">Lossless.dll успешно установлен</string>
-    <string name="lossless_scaling_install_failed">Не удалось установить Lossless.dll</string>
-    <string name="error_lossless_copy_failed">Не удалось скопировать выбранный файл.</string>
-    <string name="error_lossless_unreadable">Не удалось прочитать выбранный файл.</string>
-    <string name="error_lossless_not_pe">Выбранный файл не является библиотекой Windows. Выберите Lossless.dll из установки Lossless Scaling.</string>
-    <string name="error_lossless_missing_shaders">Эта копия Lossless.dll не содержит шейдеров генерации кадров. Обновите Lossless Scaling и попробуйте снова.</string>
-    <string name="error_lossless_translation_failed">Не удалось транслировать шейдеры генерации кадров. Эта версия Lossless Scaling пока не поддерживается.</string>
-    <string name="error_lossless_cache_failed">Не удалось записать транслированные шейдеры в хранилище. Проверьте, есть ли свободное место.</string>
    <string name="advanced_settings">Расширенные настройки</string>
    <string name="settings_description">Настройка параметров эмулятора</string>
    <string name="search_recently_played">Недавно сыгранные</string>
@@ -491,9 +439,6 @@
    <string name="use_custom_rtc_description">Позволяет установить пользовательские часы реального времени отдельно от текущего системного времени.</string>
    <string name="set_custom_rtc">Установить пользовательский RTC</string>

-    <!-- CPU -->
-    <string name="fast_cpu_time">Тактовая частота ЦП</string>
-    <string name="fast_cpu_time_description">Повышает тактовую частоту, которую сообщает эмулируемый процессор, что убирает некоторые ограничители FPS. На более слабых процессорах производительность может снизиться, а в некоторых играх возможно некорректное поведение.</string>
    <string name="custom_cpu_ticks">Пользовательские такты ЦП</string>
    <string name="custom_cpu_ticks_description">Установите пользовательское значение тактов ЦП. Более высокие значения могут увеличить производительность, но также могут вызвать зависание игры. Рекомендуется диапазон 77–21000.</string>
    <string name="cpu_ticks">Такты</string>
@@ -554,8 +499,6 @@

    <string name="hacks">Хаки</string>

-    <string name="fast_gpu_time">Тактовая частота ГПУ</string>
-    <string name="fast_gpu_time_description">Заставляет игру думать, что работа ГПУ завершается быстрее, чем на самом деле, поэтому она перестаёт снижать разрешение и дистанцию прорисовки, чтобы подстраиваться под тактовые частоты Switch.</string>
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
    <string name="fix_bloom_effects">Исправить эффекты размытия</string>
@@ -602,7 +545,6 @@

    <!-- Debug settings strings -->
    <string name="cpu">ЦП</string>
-    <string name="clocks">Тактовая частота</string>
    <string name="use_auto_stub">Использовать Auto Stub</string>
    <string name="use_auto_stub_description">Автоматически заглушает отсутствующие сервисы и функции. Может улучшить совместимость, но вызывать сбои и проблемы стабильности.</string>

@@ -617,6 +559,7 @@
    <string name="log">Логирование</string>
    <string name="flush_by_line">Сбрасывать логи отладки построчно</string>
    <string name="flush_by_line_description">Сбрасывает логи отладки после каждой написанной строки, упрощая отладку в случае сбоев или зависаний.</string>
+
    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Ведение журнала ГПУ</string>
    <string name="gpu_log_level">Уровень журналирования</string>
@@ -1001,16 +944,6 @@
    <string name="memory_6gb">6 ГБ (Небезопасно)</string>
    <string name="memory_8gb">8 ГБ (Небезопасно)</string>

-    <!-- CPU clock levels -->
-    <string name="clock_normal">Обычная</string>
-    <string name="clock_boost">Турбо</string>
-    <string name="clock_fast">Разгон</string>
-
-    <!-- GPU clock levels -->
-    <string name="fast_gpu_normal">Обычная</string>
-    <string name="fast_gpu_medium">Турбо</string>
-    <string name="fast_gpu_high">Разгон</string>
-
    <!-- GPU swizzle texture size -->
    <string name="gpu_texturesizeswizzle_verysmall">Очень малый (16 МБ)</string>
    <string name="gpu_texturesizeswizzle_small">Малый (32 МБ)</string>
@@ -1138,6 +1071,7 @@
    <string name="theme_mode_light">Светлая</string>
    <string name="theme_mode_dark">Темная</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Чёрный фон</string>
    <string name="use_black_backgrounds_description">При использовании темной темы применяйте черный фон.</string>
@@ -60,6 +60,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Ова оптимизација убрзава приступ меморији од стране гостујућег програма. Укључивање изазива да се читања/уписа меморије госта обављају директно у меморији и користе MMU домаћина. Искључивање присиљава све приступе меморији да користе софтверску емулацију MMU.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">НВДЕЦ Емулација</string>
+    <string name="nvdec_emulation_description">Изаберите како се видео декодирање (НВДЕЦ) обрађује током секс и увозних интросија.</string>
    <string name="nvdec_emulation_none">Ниједан</string>

    <!-- Optimize SPIRV output -->
@@ -400,6 +401,7 @@
    <string name="log">Сечеља</string>
    <string name="flush_by_line">Записници за уклањање погрешака по линији</string>
    <string name="flush_by_line_description">Испушта ознаке за уклањање погрешака на сваком писменом линијском линији, олакшавање уклањања погрешака у случајевима пада или замрзавања.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Излазни мотор</string>
    <string name="audio_volume">Запремина</string>
@@ -106,6 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Емуляція NVDEC</string>
+    <string name="nvdec_emulation_description">Обробка відео під час катсцен</string>
    <string name="nvdec_emulation_none">Вимкнено</string>

    <!-- Optimize SPIRV output -->
@@ -553,6 +554,7 @@
    <string name="log">Журналювання</string>
    <string name="flush_by_line">Скидати логи налагодження по рядках</string>
    <string name="flush_by_line_description">Скидає логи налагодження після кожного написаного рядка, полегшуючи налагодження у випадках збоїв або зависань.</string>
+
    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Журналювання ГП</string>
    <string name="gpu_log_level">Рівень журналювання</string>
@@ -1051,6 +1053,7 @@
    <string name="theme_mode_light">Світла</string>
    <string name="theme_mode_dark">Темна</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Чорний фон</string>
    <string name="use_black_backgrounds_description">Використовувати чорний фон у темній темі.</string>
@@ -62,6 +62,7 @@
    <string name="cpuopt_unsafe_host_mmu_description">Tối ưu hóa này tăng tốc độ truy cập bộ nhớ của chương trình khách. Bật nó lên khiến các thao tác đọc/ghi bộ nhớ khách được thực hiện trực tiếp vào bộ nhớ và sử dụng MMU của Máy chủ. Tắt tính năng này buộc tất cả quyền truy cập bộ nhớ phải sử dụng Giả lập MMU Phần mềm.</string>
    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">Giả lập NVDEC</string>
+    <string name="nvdec_emulation_description">Chọn cách xử lý giải mã video</string>
    <string name="nvdec_emulation_none">Tắt</string>

    <!-- Optimize SPIRV output -->
@@ -372,6 +373,7 @@
    <string name="log">Ghi nhật ký</string>
    <string name="flush_by_line">Xả nhật ký gỡ lỗi theo dòng</string>
    <string name="flush_by_line_description">Xả nhật ký gỡ lỗi trên mỗi dòng được viết, giúp gỡ lỗi dễ dàng hơn trong trường hợp bị treo hoặc sập.</string>
+
    <!-- Audio settings strings -->
    <string name="audio_output_engine">Công cụ xuất âm thanh</string>
    <string name="audio_volume">Âm lượng</string>
@@ -106,7 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC模拟</string>
-    <string name="nvdec_emulation_description">如果在过场动画中出现崩溃就切换为 CPU。</string>
+    <string name="nvdec_emulation_description">播放过场与开场动画期间的视频解码处理方式（NVDEC）。</string>
    <string name="nvdec_emulation_none">禁用</string>

    <!-- Optimize SPIRV output -->
@@ -291,67 +291,6 @@
    <string name="gpu_driver_fetcher">GPU驱动获取器</string>
    <string name="gpu_driver_manager">GPU 驱动管理器</string>
    <string name="install_gpu_driver_description">安装替代的驱动程序以获得更好的性能和精度</string>
-    <string name="frame_gen">帧生成</string>
-    <string name="frame_gen_per_game_description">配置针对此游戏的帧生成设定</string>
-    <string name="frame_gen_description">设定要在使用无损缩放渲染的帧之间应用的插帧。启用后强制采用FIFO呈现模式 。</string>
-    <string name="frame_gen_multiplier">多帧生成</string>
-    <string name="frame_gen_multiplier_description">对于每个渲染帧，设定应显示的帧。数值越高，所消耗的 GPU 时间就越会成倍增多。如果设定超过显示器能力的帧数，将会降低模拟速度。</string>
-    <string name="frame_gen_multiplier_2x">2x</string>
-    <string name="frame_gen_multiplier_3x">3x</string>
-    <string name="frame_gen_multiplier_4x">4x</string>
-    <string name="frame_gen_target_rate">目标帧率</string>
-    <string name="frame_gen_target_rate_description">选取一个符合显示器实际能能力的帧率。增幅会自动调整以保持设定的帧率不变，并回调任何会导致游戏运行变慢的设定。</string>
-    <string name="frame_gen_target_rate_off">使用固定增幅</string>
-    <string name="frame_gen_target_rate_60">60 FPS</string>
-    <string name="frame_gen_target_rate_90">90 FPS</string>
-    <string name="frame_gen_target_rate_120">120 FPS</string>
-    <string name="frame_gen_target_rate_144">144 FPS</string>
-    <string name="frame_gen_target_rate_165">165 FPS</string>
-    <string name="frame_gen_queue_target">帧队列目标</string>
-    <string name="frame_gen_queue_target_description">在显示之前有多少已完成渲染的帧正在等待。较大的队列可以缓解 GPU 突发的压力，但会增加输入延迟。</string>
-    <string name="frame_gen_queue_target_0">最低延迟 (无缓冲)</string>
-    <string name="frame_gen_queue_target_1">平衡 (1 帧)</string>
-    <string name="frame_gen_queue_target_2">最平滑 (2 帧)</string>
-    <string name="frame_gen_flow_scale_auto">将运动预估与游戏匹配</string>
-    <string name="frame_gen_flow_scale_auto_description">在游戏实际渲染的分辨率下估算运动，而不是在放大后的输出上。不会影响精确性，因为放大并不会增加运动细节。</string>
-    <string name="frame_gen_flow_scale">运动预估分辨率</string>
-    <string name="frame_gen_flow_scale_description">光流通道的分辨率,以输出的比例表示。降低它是提升性能最经济的做法。</string>
-    <string name="frame_gen_fp16">半精度着色器</string>
-    <string name="frame_gen_fp16_description">使用 16 位着色器变体。如果驱动或文件不支持会自动回退。</string>
-    <string name="frame_gen_dump_flow">转储已生成的帧</string>
-    <string name="frame_gen_dump_flow_description">为了排查问题，把光流 mip 级别和插值帧写入 lossless/debug 文件夹一次</string>
-    <string name="frame_gen_unsupported">帧生成不可用</string>
-    <string name="frame_gen_unsupported_description">这个 GPU 驱动不支持无损缩放着色器所需的 Vulkan 内存模型。</string>
-    <string name="lossless_scaling_setup_description">作为可选项。请提供您自己的 Lossless.dll 以便在之后可以启用帧生成。</string>
-    <string name="lossless_scaling_install">安装 Lossless.dll</string>
-    <string name="lossless_scaling_install_description">帧生成需要您自己从 Lossless Scaling 获得合法的 Lossless.dll 副本</string>
-    <string name="lossless_scaling_replace_description">选择其它 Lossless.dll 副本</string>
-    <string name="frame_generation_support">帧生成</string>
-    <string name="frame_generation_supported">支持</string>
-    <string name="frame_generation_unsupported">不支持 (无 Vulkan 内存模型)</string>
-    <string name="lossless_scaling">无损缩放</string>
-    <string name="lossless_scaling_description">提供您自己的 Lossless.dll 文件以启用帧生成</string>
-    <string name="lossless_scaling_installed">已安装</string>
-    <string name="lossless_scaling_not_installed">未安装</string>
-    <string name="lossless_scaling_replace">替换</string>
-    <string name="lossless_scaling_remove">移除</string>
-    <string name="lossless_scaling_remove_description">删除已安装的 Lossless.dll 及其准备好的着色器</string>
-    <string name="lossless_scaling_remove_confirmation">帧生成将停止工作,直到您重新安装 Lossless.dll。您的原始文件不会受到影响。</string>
-    <string name="lossless_scaling_missing">未安装 Lossless.dll</string>
-    <string name="lossless_scaling_missing_description">请从设置 › 无损缩放安装它以使用帧生成。</string>
-    <string name="lossless_scaling_locked">请先关闭游戏</string>
-    <string name="lossless_scaling_locked_description">无法在游戏运行时更改 Lossless.dll。</string>
-    <string name="lossless_scaling_remove_unavailable">没有可以移除的项目</string>
-    <string name="lossless_scaling_remove_unavailable_description">尚未安装 Lossless.dll。</string>
-    <string name="lossless_scaling_installing">正在准备帧生成着色器...</string>
-    <string name="lossless_scaling_install_success">已成功安装 Lossless.dll</string>
-    <string name="lossless_scaling_install_failed">无法安装 Lossless.dll </string>
-    <string name="error_lossless_copy_failed">无法复制选定的文件。</string>
-    <string name="error_lossless_unreadable">无法读取选定的文件。</string>
-    <string name="error_lossless_not_pe">选定的文件不是一个 Windows 动态链接库。请从您的 Lossless Scaling 安装目录中选择 Lossless.dll。</string>
-    <string name="error_lossless_missing_shaders">此副本的 Lossless.dll 中尚未包含帧生成着色器。请更新 Lossless Scaling 然后重试。</string>
-    <string name="error_lossless_translation_failed">无法翻译帧生成着色器。尚未支持此版本的 Lossless Scaling。</string>
-    <string name="error_lossless_cache_failed">已翻译的着色器无法写入到存储中。请确认其是否拥有足够的可用空间。</string>
    <string name="advanced_settings">高级设置</string>
    <string name="settings_description">更改模拟器设置</string>
    <string name="search_recently_played">最近游玩</string>
@@ -620,6 +559,7 @@
    <string name="log">日志记录</string>
    <string name="flush_by_line">按行刷新调试日志</string>
    <string name="flush_by_line_description">在每行写入时刷新调试日志，使在崩溃或冻结时调试更容易。</string>
+
    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">GPU 日志</string>
    <string name="gpu_log_level">日志等级</string>
@@ -1141,6 +1081,7 @@
    <string name="theme_mode_light">浅色</string>
    <string name="theme_mode_dark">深色</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">使用黑色背景</string>
    <string name="use_black_backgrounds_description">使用深色主题时，套用黑色背景。</string>
@@ -106,7 +106,7 @@

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC模擬</string>
-    <string name="nvdec_emulation_description">若在過場動畫中當機請切換成 CPU</string>
+    <string name="nvdec_emulation_description">選擇影片解碼（NVDEC）的方式</string>
    <string name="nvdec_emulation_none">無</string>

    <!-- Optimize SPIRV output -->
@@ -182,7 +182,7 @@
    <string name="multiplayer_hide_empty_rooms">隱藏空房間</string>
    <string name="multiplayer_tap_refresh_to_check_again">點擊重新整理以重試</string>
    <string name="multiplayer_search_public_lobbies">搜尋房間…</string>
-    <string name="multiplayer_preferred_game_name">遊戲</string>
+    <string name="multiplayer_preferred_game_name">首選遊戲</string>
    <string name="multiplayer_lobby_type">大廳類型</string>
    <string name="multiplayer_room_name_error">長度需為3-20個字元</string>
    <string name="multiplayer_required">必填</string>
@@ -237,11 +237,11 @@
    <string name="update_install_failed">更新安裝失敗：%1$s</string>
    <string name="home_search">搜尋</string>
    <string name="home_settings">設定</string>
-    <string name="empty_gamelist">找不到檔案，或者尚未選取遊戲目錄</string>
+    <string name="empty_gamelist">找不到檔案，或者尚未選取遊戲目錄。</string>
    <string name="manage_game_folders">管理遊戲資料夾</string>
    <string name="select_games_folder_description">允許 Eden 尋找您的遊戲檔案</string>
    <string name="add_games_warning">跳過選擇遊戲資料夾？</string>
-    <string name="add_games_warning_description">如果未選擇遊戲資料夾，遊戲將不會顯示在遊戲清單</string>
+    <string name="add_games_warning_description">如果未選擇遊戲資料夾，遊戲將不會顯示在遊戲清單。</string>
    <string name="add_games_warning_help">https://yuzu-mirror.github.io/help/quickstart/#dumping-games</string>
    <string name="home_search_games">搜尋遊戲</string>
    <string name="search_settings">搜尋設定</string>
@@ -291,38 +291,6 @@
    <string name="gpu_driver_fetcher">GPU驅動程式下載器</string>
    <string name="gpu_driver_manager">GPU 驅動程式管理員</string>
    <string name="install_gpu_driver_description">安裝替代驅動程式以取得潛在的更佳效能或準確度</string>
-    <string name="frame_gen">影格生成</string>
-    <string name="frame_gen_per_game_description">調整此遊戲的影格生成設定</string>
-    <string name="frame_gen_description">使用 Lossless Scaling 在已渲染的影格之間插入補間影格。啟用此功能時，會強制採用 FIFO 垂直同步</string>
-    <string name="frame_gen_multiplier">影格倍率</string>
-    <string name="frame_gen_multiplier_description">設定在每個已渲染的影格中要顯示的影格數。數值越高所需的 GPU 運算時間也會按比例增加。若要求的影格數超過裝置顯示器能呈現的數量將會降低模擬速度</string>
-    <string name="frame_gen_multiplier_2x">2x</string>
-    <string name="frame_gen_multiplier_3x">3x</string>
-    <string name="frame_gen_multiplier_4x">4x</string>
-    <string name="frame_gen_target_rate">目標影格率</string>
-    <string name="frame_gen_target_rate_description">選擇裝置顯示器能實際呈現的影格率。之後倍率器會自動升高或降低以維持影格率。如果某個調整導致遊戲本身運作變慢，則會自動復原該設定</string>
-    <string name="frame_gen_target_rate_off">使用固定倍率</string>
-    <string name="frame_gen_target_rate_60">60 FPS</string>
-    <string name="frame_gen_target_rate_90">90 FPS</string>
-    <string name="frame_gen_target_rate_120">120 FPS</string>
-    <string name="frame_gen_target_rate_144">144 FPS</string>
-    <string name="frame_gen_target_rate_165">165 FPS</string>
-    <string name="frame_gen_queue_target">影格佇列目標</string>
-    <string name="frame_gen_queue_target_description">最多允許多少個已完成的影格在顯示器前等待，較大的佇列可以吸收 GPU 突發負載，但會增加輸入延遲</string>
-    <string name="frame_gen_queue_target_0">最低延遲（無緩衝）</string>
-    <string name="frame_gen_queue_target_1">平衡（1影格）</string>
-    <string name="frame_gen_queue_target_2">最流暢（2影格）</string>
-    <string name="frame_gen_flow_scale_auto">配合遊戲調整運動預測</string>
-    <string name="frame_gen_flow_scale_auto_description">以遊戲實際渲染的解析度而非升頻後的輸出進行運動預測。由於升頻後不會增加任何動態細節，因此不會影響準確度</string>
-    <string name="frame_gen_flow_scale">運動預測解析度</string>
-    <string name="frame_gen_flow_scale_description">光流處理的解析度，以輸出解析度的比例表示。降低此設定值是減少效能負載最有效的方法</string>
-    <string name="frame_gen_fp16">半準確著色器</string>
-    <string name="frame_gen_fp16_description">使用16位元著色器。如果驅動程式或著色器檔案不支援則會自動切換成其它版本</string>
-    <string name="frame_gen_dump_flow">傾印生成的著色器</string>
-    <string name="frame_gen_dump_flow_description">將光流的 MIP 層級與補間影格寫入 Eden 資料夾中的 lossless\debug 資料夾以便進行疑難排解</string>
-    <string name="frame_gen_unsupported">無法使用影格生成</string>
-    <string name="frame_gen_unsupported_description">Lossless Scaling 的著色器需要 Vulkan 記憶體模型，所選的驅動程式不支援該功能</string>
-    <string name="lossless_scaling_setup_description">可選擇安裝自己擁有的 Lossless.dll 以在之後啟用影格生成功能</string>
    <string name="advanced_settings">進階設定</string>
    <string name="settings_description">進行模擬器設定</string>
    <string name="search_recently_played">最近遊玩</string>
@@ -591,6 +559,7 @@
    <string name="log">日誌</string>
    <string name="flush_by_line">按行寫入偵錯日誌</string>
    <string name="flush_by_line_description">在每行寫入時重新整理偵錯日誌，讓程式在當機或閃退時更容易偵錯。</string>
+
    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">GPU 日誌</string>
    <string name="gpu_log_level">記錄層級</string>
@@ -726,7 +695,7 @@
    <string name="import_complete">導入完成</string>
    <string name="use_global_setting">使用全域設定</string>
    <string name="operation_completed_successfully">操作已成功完成</string>
-    <string name="confirm">確認</string>
+    <string name="confirm">下載</string>
    <string name="load">載入</string>
    <string name="save">儲存</string>

@@ -899,7 +868,7 @@
    <string name="driver_missing_title">需要GPU驅動程式</string>
    <string name="driver_missing_message">這個遊戲的設定需要 \"%s\"驅動程式，而它並沒有安裝在您的裝置上\n\n要下載並安裝此驅動程式嗎？</string>
    <string name="driver_download_cancelled">驅動程式下載已取消。沒有所需的驅動程式無法啟動遊戲。</string>
-    <string name="download">下載</string>
+    <string name="download">遷移</string>

    <!-- Emulation Menu -->
    <string name="emulation_exit">結束模擬</string>
@@ -1037,6 +1006,7 @@
    <string name="theme_mode_light">淺色</string>
    <string name="theme_mode_dark">深色</string>

+
    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">黑色背景</string>
    <string name="use_black_backgrounds_description">使用深色主題時，套用黑色背景。</string>
@@ -636,8 +636,6 @@
    <string name="log">Logging</string>
    <string name="flush_by_line">Flush debug logs by line</string>
    <string name="flush_by_line_description">Flushes debugging logs on each line written, making debugging easier in cases of crashing or freezing.</string>
-    <string name="extended_logging">Enable extended logging</string>
-    <string name="extended_logging_description">Increases the maximum log file size from 100 MiB to 1 GiB.</string>
    <string name="log_filter">Log filter</string>
    <string name="log_filter_description">Controls Eden\'s log categories. Example: *:Info Service.LM:Debug</string>

@@ -1764,51 +1762,6 @@ RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
-    </string>
-    <string name="license_opus" translatable="false">Opus</string>
-    <string name="license_opus_description" translatable="false">Modern audio compression for the internet</string>
-    <string name="license_opus_link" translatable="false">https://github.com/xiph/opus</string>
-    <string name="license_opus_copyright" translatable="false">Copyright 2001–2011 Xiph.Org, Skype Limited, Octasic, Jean-Marc Valin, Timothy B. Terriberry, CSIRO, Gregory Maxwell, Mark Borgerding, Erik de Castro Lopo</string>
-    <string name="license_opus_text" translatable="false">
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:\n\n
-
- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.\n\n
-
- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.\n\n
-
- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.\n\n
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:\n\n
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/ \n\n
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/ \n\n
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
    </string>
    <string name="license_sirit" translatable="false">Sirit</string>
    <string name="license_sirit_description" translatable="false">A runtime SPIR-V assembler</string>
@@ -15,10 +15,6 @@ add_library(audio_core STATIC
    adsp/apps/audio_renderer/command_list_processor.h
    adsp/apps/opus/opus_decoder.cpp
    adsp/apps/opus/opus_decoder.h
-    adsp/apps/opus/opus_decode_object.cpp
-    adsp/apps/opus/opus_decode_object.h
-    adsp/apps/opus/opus_multistream_decode_object.cpp
-    adsp/apps/opus/opus_multistream_decode_object.h
    adsp/apps/opus/shared_memory.h
    audio_core.cpp
    audio_core.h
@@ -226,8 +222,14 @@ else()
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>)
 endif()

-target_include_directories(audio_core PRIVATE ${OPUS_INCLUDE_DIRS})
-target_link_libraries(audio_core PUBLIC common core Opus::opus)
+if (YUZU_USE_EXTERNAL_FFMPEG)
+    add_dependencies(audio_core ffmpeg-build)
+endif()
+target_include_directories(audio_core PUBLIC ${FFmpeg_INCLUDE_DIR})
+target_link_libraries(audio_core PRIVATE ${FFmpeg_LIBRARIES})
+target_link_options(audio_core PRIVATE ${FFmpeg_LDFLAGS})
+
+target_link_libraries(audio_core PUBLIC common core)

 if (ENABLE_CUBEB)
    target_sources(audio_core PRIVATE
@@ -1,107 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "audio_core/adsp/apps/opus/opus_decode_object.h"
-#include "common/assert.h"
-
-namespace AudioCore::ADSP::OpusDecoder {
-namespace {
-bool IsValidChannelCount(u32 channel_count) {
-    return channel_count == 1 || channel_count == 2;
-}
-} // namespace
-
-u32 OpusDecodeObject::GetWorkBufferSize(u32 channel_count) {
-    if (!IsValidChannelCount(channel_count)) {
-        return 0;
-    }
-    return static_cast<u32>(sizeof(OpusDecodeObject)) + opus_decoder_get_size(channel_count);
-}
-
-OpusDecodeObject& OpusDecodeObject::Initialize(u64 buffer, u64 buffer2) {
-    auto* new_decoder = reinterpret_cast<OpusDecodeObject*>(buffer);
-    auto* comparison = reinterpret_cast<OpusDecodeObject*>(buffer2);
-
-    if (new_decoder->magic == DecodeObjectMagic) {
-        if (!new_decoder->initialized ||
-            (new_decoder->initialized && new_decoder->self == comparison)) {
-            new_decoder->state_valid = true;
-        }
-    } else {
-        new_decoder->initialized = false;
-        new_decoder->state_valid = true;
-    }
-    return *new_decoder;
-}
-
-s32 OpusDecodeObject::InitializeDecoder(u32 sample_rate, u32 channel_count) {
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    if (initialized) {
-        return OPUS_OK;
-    }
-
-    // Unfortunately libopus does not expose the OpusDecoder struct publicly, so we can't include
-    // it in this class. Nintendo does not allocate memory, which is why we have a workbuffer
-    // provided.
-    // We could use _create and have libopus allocate it for us, but then we have to separately
-    // track which decoder is being used between this and multistream in order to call the correct
-    // destroy from the host side.
-    // This is a bit cringe, but is safe as these objects are only ever initialized inside the given
-    // workbuffer, and GetWorkBufferSize will guarantee there's enough space to follow.
-    decoder = (LibOpusDecoder*)(this + 1);
-    s32 ret = opus_decoder_init(decoder, sample_rate, channel_count);
-    if (ret == OPUS_OK) {
-        magic = DecodeObjectMagic;
-        initialized = true;
-        state_valid = true;
-        self = this;
-        final_range = 0;
-    }
-    return ret;
-}
-
-s32 OpusDecodeObject::Shutdown() {
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    if (initialized) {
-        magic = 0x0;
-        initialized = false;
-        state_valid = false;
-        self = nullptr;
-        final_range = 0;
-        decoder = nullptr;
-    }
-    return OPUS_OK;
-}
-
-s32 OpusDecodeObject::ResetDecoder() {
-    return opus_decoder_ctl(decoder, OPUS_RESET_STATE);
-}
-
-s32 OpusDecodeObject::Decode(u32& out_sample_count, u64 output_data, u64 output_data_size,
-                             u64 input_data, u64 input_data_size) {
-    ASSERT(initialized);
-    out_sample_count = 0;
-
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    auto ret_code_or_samples = opus_decode(
-        decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
-        reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
-
-    if (ret_code_or_samples < OPUS_OK) {
-        return ret_code_or_samples;
-    }
-
-    out_sample_count = ret_code_or_samples;
-    return opus_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
-}
-
-} // namespace AudioCore::ADSP::OpusDecoder
@@ -1,38 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <opus.h>
-
-#include "common/common_types.h"
-
-namespace AudioCore::ADSP::OpusDecoder {
-using LibOpusDecoder = ::OpusDecoder;
-static constexpr u32 DecodeObjectMagic = 0xDEADBEEF;
-
-class OpusDecodeObject {
-public:
-    static u32 GetWorkBufferSize(u32 channel_count);
-    static OpusDecodeObject& Initialize(u64 buffer, u64 buffer2);
-
-    s32 InitializeDecoder(u32 sample_rate, u32 channel_count);
-    s32 Shutdown();
-    s32 ResetDecoder();
-    s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
-               u64 input_data_size);
-    u32 GetFinalRange() const noexcept {
-        return final_range;
-    }
-
-private:
-    u32 magic;
-    bool initialized;
-    bool state_valid;
-    OpusDecodeObject* self;
-    u32 final_range;
-    LibOpusDecoder* decoder;
-};
-static_assert(std::is_trivially_constructible_v<OpusDecodeObject>);
-
-} // namespace AudioCore::ADSP::OpusDecoder
@@ -5,55 +5,388 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <array>
-#include <chrono>

-#include "audio_core/adsp/apps/opus/opus_decode_object.h"
-#include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
+extern "C" {
+#include <libswresample/swresample.h>
+#include <libavcodec/avcodec.h>
+#include <libavcodec/codec.h>
+#include <libavcodec/packet.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/frame.h>
+#include <libavutil/opt.h>
+#include <libavutil/samplefmt.h>
+}
+
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/audio_core.h"
-#include "audio_core/common/common.h"
 #include "common/logging.h"
 #include "common/thread.h"
 #include "core/core.h"
 #include "core/core_timing.h"
+#include "core/hle/service/audio/errors.h"

 namespace AudioCore::ADSP::OpusDecoder {

 namespace {
-constexpr size_t OpusStreamCountMax = 255;
+constexpr u32 OPUS_STREAM_COUNT_MAX = 255;
+// https://git.ffmpeg.org/gitweb/ffmpeg.git/blob_plain/HEAD:/libavcodec/libopusdec.c
+constexpr u32 OPUS_HEAD_SIZE = 19;
+constexpr u32 OPUS_MAX_CHANNELS = 2;

 bool IsValidChannelCount(u32 channel_count) {
-    return channel_count == 1 || channel_count == 2;
+    return channel_count >= 1 || channel_count <= OPUS_MAX_CHANNELS;
 }

-bool IsValidMultiStreamChannelCount(u32 channel_count) {
-    return channel_count <= OpusStreamCountMax;
+bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
+    return total_stream_count > 0 && total_stream_count <= OPUS_STREAM_COUNT_MAX
+        && s32(stereo_stream_count) >= 0 && stereo_stream_count <= total_stream_count;
 }

-bool IsValidMultiStreamStreamCounts(s32 total_stream_count, s32 stereo_stream_count) {
-    return IsValidMultiStreamChannelCount(total_stream_count) && total_stream_count > 0 &&
-           stereo_stream_count >= 0 && stereo_stream_count <= total_stream_count;
-}
+class OpusGenericDecodeObject {
+public:
+    static u32 GetWorkBufferSizeMultistream(u32 total_stream_count, u32 stereo_stream_count) {
+        if (IsValidStreamCounts(total_stream_count, stereo_stream_count))
+            return 48 + 2556 * (total_stream_count * stereo_stream_count);
+        return 0;
+    }
+
+    static u32 GetWorkBufferSize(u32 channel_count) {
+        if (channel_count == 1 || channel_count == 2)
+            return 48 + 16 * channel_count;
+        return 0;
+    }
+
+    /// idempotency of initialize is guaranteed
+    Result InitializeDecoder(u32 sample_rate, u32 total_stream_count, u32 channel_count, u32 stereo_stream_count, u8 const* mappings) {
+        // prefer libopus, ffmpeg docs say to use libopus **if** available
+        // However, native opus can also work with swrescale:
+        // it uses planarfloat, we can resample to s16
+        AVCodec const* codec = avcodec_find_decoder_by_name("libopus");
+        bool is_libopus = codec != nullptr;
+        if (!codec) {
+            LOG_WARNING(Audio_DSP, "using ffmpeg native opus decoder");
+            codec = avcodec_find_decoder(AV_CODEC_ID_OPUS);
+        }
+        if (codec) {
+            if ((avc = avc ? avc : avcodec_alloc_context3(codec))) {
+                if (is_libopus) {
+                    const std::array<u8, 2> mapping_arr{0, 1};
+                    mappings = mappings ? mappings : mapping_arr.data();
+
+                    // freed by avcodec_context_free()
+                    u8 *edata = reinterpret_cast<u8*>(av_mallocz(OPUS_HEAD_SIZE + 2 * OPUS_MAX_CHANNELS + AV_INPUT_BUFFER_PADDING_SIZE));
+                    ASSERT(edata);
+                    edata[9] = u8(channel_count); //channels
+                    edata[10] = u8(0); //opus->pre_skip
+                    edata[16] = u8(0); //gain_db
+                    edata[18] = u8(0); //channel_map
+                    edata[OPUS_HEAD_SIZE + 0] = u8(total_stream_count);
+                    edata[OPUS_HEAD_SIZE + 1] = u8(stereo_stream_count);
+                    if (channel_count >= 1) edata[OPUS_HEAD_SIZE + 2] = mappings[0];
+                    if (channel_count >= 2) edata[OPUS_HEAD_SIZE + 3] = mappings[1];
+                    avc->extradata = edata;
+                    avc->extradata_size = OPUS_HEAD_SIZE + 2 * channel_count;
+                }
+
+
+                // FFmpeg hardcodes sample rate
+                avc->sample_rate = sample_rate;
+                avc->request_sample_fmt = AV_SAMPLE_FMT_S16;
+                av_channel_layout_default(&avc->ch_layout, channel_count);
+                if (avcodec_open2(avc, codec, nullptr) >= 0) {
+                    avpkt = av_packet_alloc();
+                    frame = av_frame_alloc();
+                    return ResultSuccess;
+                } else {
+                    avcodec_free_context(&avc);
+                }
+            }
+        }
+        return Service::Audio::ResultLibOpusInternalError;
+    }
+
+    Result Shutdown() {
+        avcodec_free_context(&avc);
+        av_frame_free(&frame);
+        av_packet_free(&avpkt);
+        return ResultSuccess;
+    }
+
+    Result ResetDecoder() {
+        if (avc) {
+            if (avcodec_is_open(avc)) avcodec_flush_buffers(avc);
+            return ResultSuccess;
+        }
+        return Service::Audio::ResultLibOpusInvalidState;
+    }
+
+    Result Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data, u64 input_data_size) {
+        out_sample_count = 0;
+        if (avc) {
+            int rem_output_bytes = int(output_data_size);
+            while (rem_output_bytes > 0) {
+                int r = avcodec_receive_frame(avc, frame);
+                if (r == AVERROR(EAGAIN)) {
+                    av_packet_unref(avpkt);
+                    av_new_packet(avpkt, int(input_data_size));
+                    std::memcpy(avpkt->data, reinterpret_cast<const u8*>(input_data), input_data_size);
+                    r = avcodec_send_packet(avc, avpkt);
+                    ASSERT(r >= 0);
+                } else if (r == AVERROR_EOF) {
+                    break;
+                } else if (r >= 0) {
+                    auto const bsize = av_samples_get_buffer_size(nullptr, frame->ch_layout.nb_channels, frame->nb_samples, AV_SAMPLE_FMT_S16, 1);
+                    if (frame->format == AV_SAMPLE_FMT_S16) {
+                        std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), frame->data[0], size_t(bsize));
+                    } else {
+                        SwrContext *swr = nullptr;
+                        if (swr_alloc_set_opts2(
+                            &swr,
+                            &avc->ch_layout,
+                            AV_SAMPLE_FMT_S16,
+                            48000,
+                            &avc->ch_layout,
+                            (enum AVSampleFormat)frame->format,
+                            48000,
+                            0,
+                            nullptr
+                        ) >= 0) {
+                            if (swr_init(swr) >= 0) {
+                                AVFrame *s16_frame = av_frame_alloc();
+                                s16_frame->format = AV_SAMPLE_FMT_S16;
+                                s16_frame->sample_rate = frame->sample_rate;
+                                av_channel_layout_copy(&s16_frame->ch_layout, &frame->ch_layout);
+                                s16_frame->nb_samples = frame->nb_samples;
+                                av_frame_get_buffer(s16_frame, 0);
+                                swr_convert(swr, s16_frame->data, s16_frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples);
+                                std::memcpy(reinterpret_cast<s16*>(output_data) + (int(output_data_size) - rem_output_bytes), s16_frame->data[0], size_t(bsize));
+                                swr_free(&swr);
+                            }
+                        }
+                    }
+                    out_sample_count += frame->nb_samples;
+                    rem_output_bytes -= bsize;
+                } else {
+                    LOG_ERROR(Audio_DSP, "{}", r);
+                    break;
+                }
+            }
+            ASSERT(rem_output_bytes == 0 && "remaining bytes!");
+            return ResultSuccess;
+        }
+        return Service::Audio::ResultLibOpusInvalidState;
+    }
+
+    AVCodecContext* avc = nullptr;
+    AVPacket* avpkt = nullptr;
+    AVFrame* frame = nullptr;
+};
 } // namespace

-OpusDecoder::OpusDecoder(Core::System& system_) : system{system_} {
-    init_thread = std::jthread([this](std::stop_token stop_token) { Init(stop_token); });
+OpusDecoder::OpusDecoder(Core::System& system) {
+    dsp_thread = std::jthread([this, &system](std::stop_token stop_token) {
+        Common::SetCurrentThreadName("DSP_OpusDecoder");
+        if (Receive(Direction::DSP, stop_token) != Message::Start) {
+            LOG_ERROR(Service_Audio, "DSP OpusDecoder failed to receive Start message. Opus initialization failed.");
+            return;
+        }
+        Send(Direction::Host, Message::StartOK);
+
+        // Main OpusDecoder thread, responsible for processing the incoming Opus packets.
+        ::Common::unordered_map<u64, OpusGenericDecodeObject> decode_objects;
+        while (!stop_token.stop_requested()) {
+            auto msg = Receive(Direction::DSP, stop_token);
+            switch (msg) {
+            case Shutdown:
+                Send(Direction::Host, Message::ShutdownOK);
+                return;
+            case GetWorkBufferSize: {
+                auto channel_count = s32(shared_memory->host_send_data[0]);
+
+                ASSERT(IsValidChannelCount(channel_count));
+
+                shared_memory->dsp_return_data[0] = OpusGenericDecodeObject::GetWorkBufferSize(channel_count);
+                Send(Direction::Host, Message::GetWorkBufferSizeOK);
+                break;
+            }
+            case InitializeDecodeObject: {
+                auto buffer = shared_memory->host_send_data[0];
+                auto buffer_size = shared_memory->host_send_data[1];
+                auto sample_rate = s32(shared_memory->host_send_data[2]);
+                auto channel_count = s32(shared_memory->host_send_data[3]);
+
+                ASSERT(sample_rate >= 0);
+                ASSERT(IsValidChannelCount(channel_count));
+                ASSERT(buffer_size >= OpusGenericDecodeObject::GetWorkBufferSize(channel_count));
+
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    it->second.Shutdown();
+                    shared_memory->dsp_return_data[0] = it->second.InitializeDecoder(sample_rate, 1, channel_count, channel_count == 2 ? 1 : 0, nullptr).raw;
+                } else {
+                    OpusGenericDecodeObject obj{};
+                    shared_memory->dsp_return_data[0] = obj.InitializeDecoder(sample_rate, 1, channel_count, channel_count == 2 ? 1 : 0, nullptr).raw;
+                    decode_objects.insert_or_assign(buffer, obj);
+                }
+                Send(Direction::Host, Message::InitializeDecodeObjectOK);
+                break;
+            }
+            case ShutdownDecodeObject: {
+                auto buffer = shared_memory->host_send_data[0];
+                //[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    shared_memory->dsp_return_data[0] = it->second.Shutdown().raw;
+                } else {
+                    LOG_ERROR(Audio_DSP, "operating unregistered buffer {}", buffer);
+                    shared_memory->dsp_return_data[0] = Service::Audio::ResultLibOpusInvalidState.raw;
+                }
+                Send(Direction::Host, Message::ShutdownDecodeObjectOK);
+                break;
+            }
+            case DecodeInterleaved: {
+                auto start_time = system.CoreTiming().GetGlobalTimeUs();
+
+                auto buffer = shared_memory->host_send_data[0];
+                auto input_data = shared_memory->host_send_data[1];
+                auto input_data_size = shared_memory->host_send_data[2];
+                auto output_data = shared_memory->host_send_data[3];
+                auto output_data_size = shared_memory->host_send_data[4];
+                //auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
+                auto reset_requested = shared_memory->host_send_data[6];
+
+                u32 decoded_samples{0};
+
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    auto res = ResultSuccess;
+                    if (reset_requested)
+                        res = it->second.ResetDecoder();
+                    if (res == ResultSuccess)
+                        res = it->second.Decode(decoded_samples, output_data, output_data_size, input_data, input_data_size);
+
+                    auto end_time = system.CoreTiming().GetGlobalTimeUs();
+                    shared_memory->dsp_return_data[0] = res.raw;
+                    shared_memory->dsp_return_data[1] = decoded_samples;
+                    shared_memory->dsp_return_data[2] = (end_time - start_time).count();
+                } else {
+                    LOG_ERROR(Audio_DSP, "operating unregistered buffer {}", buffer);
+                    shared_memory->dsp_return_data[0] = Service::Audio::ResultLibOpusInvalidState.raw;
+                }
+                Send(Direction::Host, Message::DecodeInterleavedOK);
+                break;
+            }
+            case MapMemory: {
+                [[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
+                [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
+                Send(Direction::Host, Message::MapMemoryOK);
+                break;
+            }
+            case UnmapMemory: {
+                [[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
+                [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
+                Send(Direction::Host, Message::UnmapMemoryOK);
+                break;
+            }
+            case GetWorkBufferSizeForMultiStream: {
+                auto total_stream_count = s32(shared_memory->host_send_data[0]);
+                auto stereo_stream_count = s32(shared_memory->host_send_data[1]);
+
+                ASSERT(IsValidStreamCounts(total_stream_count, stereo_stream_count));
+
+                shared_memory->dsp_return_data[0] = OpusGenericDecodeObject::GetWorkBufferSizeMultistream(total_stream_count, stereo_stream_count);
+                Send(Direction::Host, Message::GetWorkBufferSizeForMultiStreamOK);
+                break;
+            }
+            case InitializeMultiStreamDecodeObject: {
+                auto buffer = shared_memory->host_send_data[0];
+                auto buffer_size = shared_memory->host_send_data[1];
+                auto sample_rate = s32(shared_memory->host_send_data[2]);
+                auto channel_count = s32(shared_memory->host_send_data[3]);
+                auto total_stream_count = s32(shared_memory->host_send_data[4]);
+                auto stereo_stream_count = s32(shared_memory->host_send_data[5]);
+                // Nintendo seem to have a bug here, they try to use &host_send_data[6] for the channel
+                // mappings, but [6] is never set, and there is not enough room in the argument data for
+                // more than 40 channels, when 255 are possible.
+                // It also means the mapping values are undefined, though likely always 0,
+                // and the mappings given by the game are ignored. The mappings are copied to this
+                // dedicated buffer host side, so let's do as intended.
+                auto mappings = shared_memory->channel_mapping.data();
+
+                ASSERT(IsValidStreamCounts(total_stream_count, stereo_stream_count));
+                ASSERT(sample_rate >= 0);
+                ASSERT(buffer_size >= OpusGenericDecodeObject::GetWorkBufferSizeMultistream(total_stream_count, stereo_stream_count));
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    it->second.Shutdown();
+                    shared_memory->dsp_return_data[0] = it->second.InitializeDecoder(sample_rate, total_stream_count, channel_count, stereo_stream_count, mappings).raw;
+                } else {
+                    OpusGenericDecodeObject obj{};
+                    shared_memory->dsp_return_data[0] = obj.InitializeDecoder(sample_rate, total_stream_count, channel_count, stereo_stream_count, mappings).raw;
+                    decode_objects.insert_or_assign(buffer, obj);
+                }
+                Send(Direction::Host, Message::InitializeMultiStreamDecodeObjectOK);
+                break;
+            }
+            case ShutdownMultiStreamDecodeObject: {
+                auto buffer = shared_memory->host_send_data[0];
+                //[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    shared_memory->dsp_return_data[0] = it->second.Shutdown().raw;
+                } else {
+                    LOG_ERROR(Audio_DSP, "operating unregistered buffer {}", buffer);
+                    shared_memory->dsp_return_data[0] = Service::Audio::ResultLibOpusInvalidState.raw;
+                }
+                Send(Direction::Host, Message::ShutdownMultiStreamDecodeObjectOK);
+                break;
+            }
+            case DecodeInterleavedForMultiStream: {
+                auto start_time = system.CoreTiming().GetGlobalTimeUs();
+
+                auto buffer = shared_memory->host_send_data[0];
+                auto input_data = shared_memory->host_send_data[1];
+                auto input_data_size = shared_memory->host_send_data[2];
+                auto output_data = shared_memory->host_send_data[3];
+                auto output_data_size = shared_memory->host_send_data[4];
+                //auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
+                auto reset_requested = shared_memory->host_send_data[6];
+
+                u32 decoded_samples{0};
+
+                if (auto const it = decode_objects.find(buffer); it != decode_objects.end()) {
+                    auto res = ResultSuccess;
+                    if (reset_requested)
+                        res = it->second.ResetDecoder();
+                    if (res == ResultSuccess)
+                        res = it->second.Decode(decoded_samples, output_data, output_data_size, input_data, input_data_size);
+
+                    auto end_time = system.CoreTiming().GetGlobalTimeUs();
+                    shared_memory->dsp_return_data[0] = res.raw;
+                    shared_memory->dsp_return_data[1] = decoded_samples;
+                    shared_memory->dsp_return_data[2] = (end_time - start_time).count();
+                } else {
+                    LOG_ERROR(Audio_DSP, "operating unregistered buffer {}", buffer);
+                    shared_memory->dsp_return_data[0] = Service::Audio::ResultLibOpusInvalidState.raw;
+                }
+                Send(Direction::Host, Message::DecodeInterleavedForMultiStreamOK);
+                break;
+            }
+            default:
+                LOG_ERROR(Audio_DSP, "Invalid OpusDecoder command {}", msg);
+                continue;
+            }
+        }
+        for (auto e : decode_objects)
+            e.second.Shutdown();
+    });
 }

 OpusDecoder::~OpusDecoder() {
-    if (!running) {
-        init_thread.request_stop();
-        return;
+    if (dsp_thread.joinable()) {
+        // Shutdown the thread
+        auto const stop_token = dsp_thread.get_stop_token();
+        Send(Direction::DSP, Message::Shutdown);
+        auto msg = Receive(Direction::Host, stop_token);
+        ASSERT_MSG(msg == Message::ShutdownOK, "Expected Opus shutdown code {}, got {}", Message::ShutdownOK, msg);
+        dsp_thread.request_stop();
+        dsp_thread.join();
    }
-
-    // Shutdown the thread
-    Send(Direction::DSP, Message::Shutdown);
-    auto msg = Receive(Direction::Host);
-    ASSERT_MSG(msg == Message::ShutdownOK, "Expected Opus shutdown code {}, got {}",
-               Message::ShutdownOK, msg);
-    main_thread.request_stop();
-    main_thread.join();
-    running = false;
 }

 void OpusDecoder::Send(Direction dir, u32 message) {
@@ -64,206 +397,4 @@ u32 OpusDecoder::Receive(Direction dir, std::stop_token stop_token) {
    return mailbox.Receive(dir, stop_token);
 }

-void OpusDecoder::Init(std::stop_token stop_token) {
-    Common::SetCurrentThreadName("DSP_OpusDecoder_Init");
-
-    if (Receive(Direction::DSP, stop_token) != Message::Start) {
-        LOG_ERROR(Service_Audio,
-                  "DSP OpusDecoder failed to receive Start message. Opus initialization failed.");
-        return;
-    }
-    main_thread = std::jthread([this](std::stop_token st) { Main(st); });
-    running = true;
-    Send(Direction::Host, Message::StartOK);
-}
-
-void OpusDecoder::Main(std::stop_token stop_token) {
-    Common::SetCurrentThreadName("DSP_OpusDecoder_Main");
-
-    while (!stop_token.stop_requested()) {
-        auto msg = Receive(Direction::DSP, stop_token);
-        switch (msg) {
-        case Shutdown:
-            Send(Direction::Host, Message::ShutdownOK);
-            return;
-
-        case GetWorkBufferSize: {
-            auto channel_count = static_cast<s32>(shared_memory->host_send_data[0]);
-
-            ASSERT(IsValidChannelCount(channel_count));
-
-            shared_memory->dsp_return_data[0] = OpusDecodeObject::GetWorkBufferSize(channel_count);
-            Send(Direction::Host, Message::GetWorkBufferSizeOK);
-        } break;
-
-        case InitializeDecodeObject: {
-            auto buffer = shared_memory->host_send_data[0];
-            auto buffer_size = shared_memory->host_send_data[1];
-            auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
-            auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
-
-            ASSERT(sample_rate >= 0);
-            ASSERT(IsValidChannelCount(channel_count));
-            ASSERT(buffer_size >= OpusDecodeObject::GetWorkBufferSize(channel_count));
-
-            auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
-            shared_memory->dsp_return_data[0] =
-                decoder_object.InitializeDecoder(sample_rate, channel_count);
-
-            Send(Direction::Host, Message::InitializeDecodeObjectOK);
-        } break;
-
-        case ShutdownDecodeObject: {
-            auto buffer = shared_memory->host_send_data[0];
-            [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
-
-            auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
-            shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
-
-            Send(Direction::Host, Message::ShutdownDecodeObjectOK);
-        } break;
-
-        case DecodeInterleaved: {
-            auto start_time = system.CoreTiming().GetGlobalTimeUs();
-
-            auto buffer = shared_memory->host_send_data[0];
-            auto input_data = shared_memory->host_send_data[1];
-            auto input_data_size = shared_memory->host_send_data[2];
-            auto output_data = shared_memory->host_send_data[3];
-            auto output_data_size = shared_memory->host_send_data[4];
-            auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
-            auto reset_requested = shared_memory->host_send_data[6];
-
-            u32 decoded_samples{0};
-
-            auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
-            s32 error_code{OPUS_OK};
-            if (reset_requested) {
-                error_code = decoder_object.ResetDecoder();
-            }
-
-            if (error_code == OPUS_OK) {
-                error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
-                                                   input_data, input_data_size);
-            }
-
-            if (error_code == OPUS_OK) {
-                if (final_range && decoder_object.GetFinalRange() != final_range) {
-                    error_code = OPUS_INVALID_PACKET;
-                }
-            }
-
-            auto end_time = system.CoreTiming().GetGlobalTimeUs();
-            shared_memory->dsp_return_data[0] = error_code;
-            shared_memory->dsp_return_data[1] = decoded_samples;
-            shared_memory->dsp_return_data[2] = (end_time - start_time).count();
-
-            Send(Direction::Host, Message::DecodeInterleavedOK);
-        } break;
-
-        case MapMemory: {
-            [[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
-            [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
-            Send(Direction::Host, Message::MapMemoryOK);
-        } break;
-
-        case UnmapMemory: {
-            [[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
-            [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
-            Send(Direction::Host, Message::UnmapMemoryOK);
-        } break;
-
-        case GetWorkBufferSizeForMultiStream: {
-            auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[0]);
-            auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[1]);
-
-            ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
-
-            shared_memory->dsp_return_data[0] = OpusMultiStreamDecodeObject::GetWorkBufferSize(
-                total_stream_count, stereo_stream_count);
-            Send(Direction::Host, Message::GetWorkBufferSizeForMultiStreamOK);
-        } break;
-
-        case InitializeMultiStreamDecodeObject: {
-            auto buffer = shared_memory->host_send_data[0];
-            auto buffer_size = shared_memory->host_send_data[1];
-            auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
-            auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
-            auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[4]);
-            auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[5]);
-            // Nintendo seem to have a bug here, they try to use &host_send_data[6] for the channel
-            // mappings, but [6] is never set, and there is not enough room in the argument data for
-            // more than 40 channels, when 255 are possible.
-            // It also means the mapping values are undefined, though likely always 0,
-            // and the mappings given by the game are ignored. The mappings are copied to this
-            // dedicated buffer host side, so let's do as intended.
-            auto mappings = shared_memory->channel_mapping.data();
-
-            ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
-            ASSERT(sample_rate >= 0);
-            ASSERT(buffer_size >= OpusMultiStreamDecodeObject::GetWorkBufferSize(
-                                      total_stream_count, stereo_stream_count));
-
-            auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
-            shared_memory->dsp_return_data[0] = decoder_object.InitializeDecoder(
-                sample_rate, total_stream_count, channel_count, stereo_stream_count, mappings);
-
-            Send(Direction::Host, Message::InitializeMultiStreamDecodeObjectOK);
-        } break;
-
-        case ShutdownMultiStreamDecodeObject: {
-            auto buffer = shared_memory->host_send_data[0];
-            [[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
-
-            auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
-            shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
-
-            Send(Direction::Host, Message::ShutdownMultiStreamDecodeObjectOK);
-        } break;
-
-        case DecodeInterleavedForMultiStream: {
-            auto start_time = system.CoreTiming().GetGlobalTimeUs();
-
-            auto buffer = shared_memory->host_send_data[0];
-            auto input_data = shared_memory->host_send_data[1];
-            auto input_data_size = shared_memory->host_send_data[2];
-            auto output_data = shared_memory->host_send_data[3];
-            auto output_data_size = shared_memory->host_send_data[4];
-            auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
-            auto reset_requested = shared_memory->host_send_data[6];
-
-            u32 decoded_samples{0};
-
-            auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
-            s32 error_code{OPUS_OK};
-            if (reset_requested) {
-                error_code = decoder_object.ResetDecoder();
-            }
-
-            if (error_code == OPUS_OK) {
-                error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
-                                                   input_data, input_data_size);
-            }
-
-            if (error_code == OPUS_OK) {
-                if (final_range && decoder_object.GetFinalRange() != final_range) {
-                    error_code = OPUS_INVALID_PACKET;
-                }
-            }
-
-            auto end_time = system.CoreTiming().GetGlobalTimeUs();
-            shared_memory->dsp_return_data[0] = error_code;
-            shared_memory->dsp_return_data[1] = decoded_samples;
-            shared_memory->dsp_return_data[2] = (end_time - start_time).count();
-
-            Send(Direction::Host, Message::DecodeInterleavedForMultiStreamOK);
-        } break;
-
-        default:
-            LOG_ERROR(Service_Audio, "Invalid OpusDecoder command {}", msg);
-            continue;
-        }
-    }
-}
-
 } // namespace AudioCore::ADSP::OpusDecoder
@@ -6,12 +6,13 @@

 #pragma once

-#include <memory>
 #include <thread>

+#include "common/container/unordered_map.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/adsp/mailbox.h"
 #include "common/common_types.h"
+#include "core/hle/result.h"

 namespace Core {
 class System;
@@ -48,16 +49,14 @@ enum Message : u32 {
    DecodeInterleavedForMultiStreamOK = 50,
 };

-/**
- * The AudioRenderer application running on the ADSP.
- */
+/// @brief The AudioRenderer application running on the ADSP.
 class OpusDecoder {
 public:
    explicit OpusDecoder(Core::System& system);
    ~OpusDecoder();

    bool IsRunning() const noexcept {
-        return running;
+        return dsp_thread.joinable();
    }

    void Send(Direction dir, u32 message);
@@ -68,28 +67,12 @@ public:
    }

 private:
-    /**
-     * Initializing thread, launched at audio_core boot to avoid blocking the main emu boot thread.
-     */
-    void Init(std::stop_token stop_token);
-    /**
-     * Main OpusDecoder thread, responsible for processing the incoming Opus packets.
-     */
-    void Main(std::stop_token stop_token);
-
-    /// Core system
-    Core::System& system;
    /// Mailbox to communicate messages with the host, drives the main thread
    Mailbox mailbox;
-    /// Init thread
-    std::jthread init_thread{};
-    /// Main thread
-    std::jthread main_thread{};
-    /// The current state
-    bool running{};
    /// Structure shared with the host, input data set by the host before sending a mailbox message,
    /// and the responses are written back by the OpusDecoder.
    SharedMemory* shared_memory{};
+    std::jthread dsp_thread{};
 };

 } // namespace AudioCore::ADSP::OpusDecoder
@@ -1,113 +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 "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
-#include "common/assert.h"
-
-namespace AudioCore::ADSP::OpusDecoder {
-
-namespace {
-constexpr u32 OpusStreamCountMax = 255;
-
-bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
-    return total_stream_count > 0 && total_stream_count <= OpusStreamCountMax &&
-           static_cast<s32>(stereo_stream_count) >= 0 &&
-           stereo_stream_count <= total_stream_count;
-}
-} // namespace
-
-u32 OpusMultiStreamDecodeObject::GetWorkBufferSize(u32 total_stream_count,
-                                                   u32 stereo_stream_count) {
-    if (IsValidStreamCounts(total_stream_count, stereo_stream_count)) {
-        return static_cast<u32>(sizeof(OpusMultiStreamDecodeObject)) +
-               opus_multistream_decoder_get_size(total_stream_count, stereo_stream_count);
-    }
-    return 0;
-}
-
-OpusMultiStreamDecodeObject& OpusMultiStreamDecodeObject::Initialize(u64 buffer, u64 buffer2) {
-    auto* new_decoder = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer);
-    auto* comparison = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer2);
-
-    if (new_decoder->magic == DecodeMultiStreamObjectMagic) {
-        if (!new_decoder->initialized ||
-            (new_decoder->initialized && new_decoder->self == comparison)) {
-            new_decoder->state_valid = true;
-        }
-    } else {
-        new_decoder->initialized = false;
-        new_decoder->state_valid = true;
-    }
-    return *new_decoder;
-}
-
-s32 OpusMultiStreamDecodeObject::InitializeDecoder(u32 sample_rate, u32 total_stream_count,
-                                                   u32 channel_count, u32 stereo_stream_count,
-                                                   u8* mappings) {
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    if (initialized) {
-        return OPUS_OK;
-    }
-
-    // See OpusDecodeObject::InitializeDecoder for an explanation of this
-    decoder = (LibOpusMSDecoder*)(this + 1);
-    s32 ret = opus_multistream_decoder_init(decoder, sample_rate, channel_count, total_stream_count,
-                                            stereo_stream_count, mappings);
-    if (ret == OPUS_OK) {
-        magic = DecodeMultiStreamObjectMagic;
-        initialized = true;
-        state_valid = true;
-        self = this;
-        final_range = 0;
-    }
-    return ret;
-}
-
-s32 OpusMultiStreamDecodeObject::Shutdown() {
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    if (initialized) {
-        magic = 0x0;
-        initialized = false;
-        state_valid = false;
-        self = nullptr;
-        final_range = 0;
-        decoder = nullptr;
-    }
-    return OPUS_OK;
-}
-
-s32 OpusMultiStreamDecodeObject::ResetDecoder() {
-    return opus_multistream_decoder_ctl(decoder, OPUS_RESET_STATE);
-}
-
-s32 OpusMultiStreamDecodeObject::Decode(u32& out_sample_count, u64 output_data,
-                                        u64 output_data_size, u64 input_data, u64 input_data_size) {
-    ASSERT(initialized);
-    out_sample_count = 0;
-
-    if (!state_valid) {
-        return OPUS_INVALID_STATE;
-    }
-
-    auto ret_code_or_samples = opus_multistream_decode(
-        decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
-        reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
-
-    if (ret_code_or_samples < OPUS_OK) {
-        return ret_code_or_samples;
-    }
-
-    out_sample_count = ret_code_or_samples;
-    return opus_multistream_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
-}
-
-} // namespace AudioCore::ADSP::OpusDecoder
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <opus_multistream.h>
-
-#include "common/common_types.h"
-
-namespace AudioCore::ADSP::OpusDecoder {
-using LibOpusMSDecoder = ::OpusMSDecoder;
-static constexpr u32 DecodeMultiStreamObjectMagic = 0xDEADBEEF;
-
-class OpusMultiStreamDecodeObject {
-public:
-    static u32 GetWorkBufferSize(u32 total_stream_count, u32 stereo_stream_count);
-    static OpusMultiStreamDecodeObject& Initialize(u64 buffer, u64 buffer2);
-
-    s32 InitializeDecoder(u32 sample_rate, u32 total_stream_count, u32 channel_count,
-                          u32 stereo_stream_count, u8* mappings);
-    s32 Shutdown();
-    s32 ResetDecoder();
-    s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
-               u64 input_data_size);
-    u32 GetFinalRange() const noexcept {
-        return final_range;
-    }
-
-private:
-    u32 magic;
-    bool initialized;
-    bool state_valid;
-    OpusMultiStreamDecodeObject* self;
-    u32 final_range;
-    LibOpusMSDecoder* decoder;
-};
-static_assert(std::is_trivially_constructible_v<OpusMultiStreamDecodeObject>);
-
-} // namespace AudioCore::ADSP::OpusDecoder
@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "common/common_types.h"
+
+namespace AudioCore::ADSP {
+
+static constexpr u32 DECODE_OBJECT_MAGIC = 0xDEADBEEF;
+struct LibOpusDecoder {
+    u32 magic;
+    bool initialized;
+    bool state_valid;
+    LibOpusDecoder* self;
+    u32 final_range;
+    void* decoder;
+};
+static_assert(sizeof(LibOpusDecoder) == 32);
+
+static constexpr u32 DECODE_MULTISTREAM_OBJECT_MAGIC = 0xDEADBEEF;
+struct LibOpusMultistreamDecoder {
+    u32 magic;
+    bool initialized;
+    bool state_valid;
+    LibOpusMultistreamDecoder* self;
+    u32 final_range;
+    void* decoder;
+};
+static_assert(sizeof(LibOpusMultistreamDecoder) == 32);
+
+}
@@ -1,9 +1,11 @@
+// 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

 #pragma once

-#include "common/common_funcs.h"
 #include "common/common_types.h"

 namespace AudioCore::ADSP::OpusDecoder {
@@ -9,39 +9,18 @@
 #include "audio_core/audio_core.h"
 #include "audio_core/opus/hardware_opus.h"
 #include "core/core.h"
+#include "core/hle/result.h"

 namespace AudioCore::OpusDecoder {
+
 namespace {
 using namespace Service::Audio;
-
-static constexpr Result ResultCodeFromLibOpusErrorCode(u64 error_code) {
-    s32 error{static_cast<s32>(error_code)};
-    ASSERT(error <= OPUS_OK);
-    switch (error) {
-    case OPUS_ALLOC_FAIL:
-        R_THROW(ResultLibOpusAllocFail);
-    case OPUS_INVALID_STATE:
-        R_THROW(ResultLibOpusInvalidState);
-    case OPUS_UNIMPLEMENTED:
-        R_THROW(ResultLibOpusUnimplemented);
-    case OPUS_INVALID_PACKET:
-        R_THROW(ResultLibOpusInvalidPacket);
-    case OPUS_INTERNAL_ERROR:
-        R_THROW(ResultLibOpusInternalError);
-    case OPUS_BUFFER_TOO_SMALL:
-        R_THROW(ResultBufferTooSmall);
-    case OPUS_BAD_ARG:
-        R_THROW(ResultLibOpusBadArg);
-    case OPUS_OK:
-        R_RETURN(ResultSuccess);
-    }
-    UNREACHABLE();
-}
-
 } // namespace

 HardwareOpus::HardwareOpus(Core::System& system_)
-    : system{system_}, opus_decoder{system.AudioCore().ADSP().OpusDecoder()} {
+    : system{system_}
+    , opus_decoder{system.AudioCore().ADSP().OpusDecoder()}
+{
    opus_decoder.SetSharedMemory(shared_memory);
 }

@@ -92,7 +71,7 @@ Result HardwareOpus::InitializeDecodeObject(u32 sample_rate, u32 channel_count,
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }

-    R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
+    R_RETURN(Result(u32(shared_memory.dsp_return_data[0])));
 }

 Result HardwareOpus::InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
@@ -120,7 +99,7 @@ Result HardwareOpus::InitializeMultiStreamDecodeObject(u32 sample_rate, u32 chan
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }

-    R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
+    R_RETURN(Result(u32(shared_memory.dsp_return_data[0])));
 }

 Result HardwareOpus::ShutdownDecodeObject(void* buffer, u64 buffer_size) {
@@ -134,7 +113,7 @@ Result HardwareOpus::ShutdownDecodeObject(void* buffer, u64 buffer_size) {
               "Expected Opus shutdown code {}, got {}",
               ADSP::OpusDecoder::Message::ShutdownDecodeObjectOK, msg);

-    R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
+    R_RETURN(Result(u32(shared_memory.dsp_return_data[0])));
 }

 Result HardwareOpus::ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size) {
@@ -149,7 +128,7 @@ Result HardwareOpus::ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_si
               "Expected Opus shutdown code {}, got {}",
               ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObjectOK, msg);

-    R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
+    R_RETURN(Result(u32(shared_memory.dsp_return_data[0])));
 }

 Result HardwareOpus::DecodeInterleaved(u32& out_sample_count, void* output_data,
@@ -173,12 +152,12 @@ Result HardwareOpus::DecodeInterleaved(u32& out_sample_count, void* output_data,
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }

-    auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
-    if (error_code == OPUS_OK) {
-        out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
+    auto error_code = s32(shared_memory.dsp_return_data[0]);
+    if (error_code == ResultSuccess.raw) {
+        out_sample_count = u32(shared_memory.dsp_return_data[1]);
        out_time_taken = 1000 * shared_memory.dsp_return_data[2];
    }
-    R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
+    R_RETURN(Result(u32(error_code)));
 }

 Result HardwareOpus::DecodeInterleavedForMultiStream(u32& out_sample_count, void* output_data,
@@ -187,29 +166,27 @@ Result HardwareOpus::DecodeInterleavedForMultiStream(u32& out_sample_count, void
                                                     void* buffer, u64& out_time_taken,
                                                     bool reset) {
    std::scoped_lock l{mutex};
-    shared_memory.host_send_data[0] = (u64)buffer;
-    shared_memory.host_send_data[1] = (u64)input_data;
+    shared_memory.host_send_data[0] = u64(buffer);
+    shared_memory.host_send_data[1] = u64(input_data);
    shared_memory.host_send_data[2] = input_data_size;
-    shared_memory.host_send_data[3] = (u64)output_data;
+    shared_memory.host_send_data[3] = u64(output_data);
    shared_memory.host_send_data[4] = output_data_size;
    shared_memory.host_send_data[5] = 0;
    shared_memory.host_send_data[6] = reset;

-    opus_decoder.Send(ADSP::Direction::DSP,
-                      ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStream);
+    opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStream);
    auto msg = opus_decoder.Receive(ADSP::Direction::Host);
    if (msg != ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK) {
-        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
-                  ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK, msg);
+        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}", ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK, msg);
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }

-    auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
-    if (error_code == OPUS_OK) {
+    auto const error_code = shared_memory.dsp_return_data[0];
+    if (error_code == ResultSuccess.raw) {
        out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
        out_time_taken = 1000 * shared_memory.dsp_return_data[2];
    }
-    R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
+    R_RETURN(Result(u32(shared_memory.dsp_return_data[0])));
 }

 Result HardwareOpus::MapMemory(void* buffer, u64 buffer_size) {
@@ -220,8 +197,7 @@ Result HardwareOpus::MapMemory(void* buffer, u64 buffer_size) {
    opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::MapMemory);
    auto msg = opus_decoder.Receive(ADSP::Direction::Host);
    if (msg != ADSP::OpusDecoder::Message::MapMemoryOK) {
-        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
-                  ADSP::OpusDecoder::Message::MapMemoryOK, msg);
+        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}", ADSP::OpusDecoder::Message::MapMemoryOK, msg);
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }
    R_SUCCEED();
@@ -235,8 +211,7 @@ Result HardwareOpus::UnmapMemory(void* buffer, u64 buffer_size) {
    opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::UnmapMemory);
    auto msg = opus_decoder.Receive(ADSP::Direction::Host);
    if (msg != ADSP::OpusDecoder::Message::UnmapMemoryOK) {
-        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
-                  ADSP::OpusDecoder::Message::UnmapMemoryOK, msg);
+        LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}", ADSP::OpusDecoder::Message::UnmapMemoryOK, msg);
        R_THROW(ResultInvalidOpusDSPReturnCode);
    }
    R_SUCCEED();
@@ -1,11 +1,12 @@
+// 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

 #pragma once

 #include <mutex>
-#include <opus.h>
-
 #include "audio_core/adsp/apps/opus/opus_decoder.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/adsp/mailbox.h"
@@ -1205,7 +1205,6 @@ else()
    endif()
 endif()

-target_include_directories(core PRIVATE ${OPUS_INCLUDE_DIRS})
 target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz)

 if (BOOST_NO_HEADERS)
@@ -367,9 +367,7 @@ endif()
 if (YUZU_USE_EXTERNAL_FFMPEG)
    add_dependencies(video_core ffmpeg-build)
 endif()
-
 target_include_directories(video_core PUBLIC ${FFmpeg_INCLUDE_DIR})
-
 target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES})
 target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})

@@ -131,11 +131,6 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
    push(Settings::values.linkage.by_category[Settings::Category::System]);

    for (auto setting : settings) {
-        if (setting->Id() == Settings::values.program_args.Id()
-            || setting->Id() == Settings::values.debug_knobs.Id()) {
-            continue;
-        }
-
        if (setting->Id() == Settings::values.use_docked_mode.Id() &&
            Settings::IsConfiguringGlobal()) {
            continue;
Author	SHA1	Message	Date
lizzie	dd879fc18e	2026-09-07 19:59:16 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 19:59:16 +00:00
lizzie	b7a087aa26	2026-09-07 19:54:19 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 19:54:19 +00:00
lizzie	7d3d082f4e	2026-09-07 09:38:06 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 09:38:06 +00:00
lizzie	0243a737e7	2026-09-07 08:28:23 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 08:28:23 +00:00
lizzie	7b053ff80a	2026-09-07 08:16:44 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 08:16:44 +00:00
lizzie	94151d5e31	2026-09-07 07:27:42 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 07:27:42 +00:00
lizzie	e0f94e553d	2026-09-07 04:32:01 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 04:32:01 +00:00
lizzie	f6f7d0975e	2026-09-07 03:47:00 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 03:47:01 +00:00
lizzie	d21170ae1f	Trigger build	2026-09-06 23:15:51 +00:00
lizzie	4fa2c858a7	2026-09-06 22:55:40 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-06 22:55:40 +00:00
lizzie	85f12449dd	2026-09-06 22:52:10 Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-06 22:52:10 +00:00
lizzie	8514352b24	nullptr check on multistream	2026-09-07 00:25:15 +02:00
lizzie	55b3b25cba	reset to nil	2026-09-07 00:25:15 +02:00
crueter	fc399e79ac	a Signed-off-by: crueter <crueter@eden-emu.dev>	2026-09-07 00:25:15 +02:00
crueter	8cdd268c01	Fix license headers	2026-09-07 00:25:15 +02:00
crueter	dc481602ad	Cleanup Signed-off-by: crueter <crueter@eden-emu.dev>	2026-09-07 00:25:15 +02:00
crueter	ed11de1b94	Improve padding Signed-off-by: crueter <crueter@eden-emu.dev>	2026-09-07 00:25:15 +02:00
crueter	b403b50287	Rebase Signed-off-by: crueter <crueter@eden-emu.dev>	2026-09-07 00:25:15 +02:00
lizzie	3312819137	adjust IsValidStreamCounts	2026-09-07 00:25:15 +02:00
lizzie	2c64de6850	fix debian	2026-09-07 00:25:15 +02:00
lizzie	b7d51e2e21	Trigger Build	2026-09-07 00:25:15 +02:00
lizzie	df7c390731	fx	2026-09-07 00:25:15 +02:00
lizzie	7e2a8be01d	brain no work	2026-09-07 00:25:15 +02:00
lizzie	65ebcb98f3	implodes	2026-09-07 00:25:15 +02:00
lizzie	a859b92c23	[audio_core/dsp] nuke libopus, use ffmpeg for opus decoding Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-09-07 00:25:15 +02:00