diff --git a/.gitmodules b/.gitmodules index ec51ef445..e762cc163 100644 --- a/.gitmodules +++ b/.gitmodules @@ -91,3 +91,6 @@ [submodule "oaknut"] path = externals/oaknut url = https://github.com/merryhime/oaknut.git +[submodule "externals/oboe"] + path = externals/oboe + url = https://github.com/google/oboe.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fc45473b6..11f76feba 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -126,6 +126,11 @@ if (MSVC) add_subdirectory(getopt) endif() +# oboe +if (ANDROID) + add_subdirectory(oboe) +endif() + # inih if(USE_SYSTEM_INIH) find_package(inih REQUIRED COMPONENTS inih inir) diff --git a/externals/oboe b/externals/oboe new file mode 160000 index 000000000..907c35a20 --- /dev/null +++ b/externals/oboe @@ -0,0 +1 @@ +Subproject commit 907c35a205b4ee9bb0b16f6a3a5a8bc1df2a6f33 diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt index a8f767907..7fe8a20be 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt @@ -61,6 +61,13 @@ class LicensesFragment : Fragment() { R.string.license_adreno_tools_copyright, R.string.license_adreno_tools_text ), + License( + R.string.license_oboe, + R.string.license_oboe_description, + R.string.license_oboe_link, + R.string.license_oboe_copyright, + R.string.license_oboe_text + ), License( R.string.license_cubeb, R.string.license_cubeb_description, diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index 2b83bc36d..f38ca06f3 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -484,6 +484,7 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Ruido Estático Dispositivo Real (cubeb) Dispositivo Real (OpenAL) + Dispositivo Real (Oboe) De lado a lado diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index cd542bae8..551b96047 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -124,6 +124,7 @@ @string/static_noise @string/real_cubeb @string/real_openal + @string/real_oboe @@ -132,6 +133,7 @@ 2 3 4 + 5 diff --git a/src/android/app/src/main/res/values/licenses.xml b/src/android/app/src/main/res/values/licenses.xml index f58438f66..69f1f607b 100644 --- a/src/android/app/src/main/res/values/licenses.xml +++ b/src/android/app/src/main/res/values/licenses.xml @@ -1,5 +1,5 @@ - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -90,6 +90,210 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + oboe + Oboe is a C++ library which makes it easy to build high-performance audio apps on Android + https://github.com/google/oboe/ + Copyright©️ Google + + \n + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n +\n + 1. Definitions.\n +\n + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document.\n +\n + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License.\n +\n + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity.\n +\n + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License.\n +\n + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files.\n +\n + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types.\n +\n + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below).\n +\n + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof.\n +\n + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution."\n +\n + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work.\n +\n + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form.\n +\n + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed.\n +\n + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions:\n +\n + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and\n +\n + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and\n +\n + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and\n +\n + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License.\n +\n + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License.\n +\n + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions.\n +\n + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file.\n +\n + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License.\n +\n + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages.\n +\n + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability.\n +\n + END OF TERMS AND CONDITIONS\n +\n + APPENDIX: How to apply the Apache License to your work.\n +\n + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don\'t include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives.\n +\n + Copyright [yyyy] [name of copyright owner]\n +\n + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at\n +\n + http://www.apache.org/licenses/LICENSE-2.0\n +\n + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. cubeb Cross platform audio library diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 6ad304cfd..96f8d55a7 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -510,6 +510,7 @@ Static Noise Real Device (cubeb) Real Device (OpenAL) + Real Device (Oboe) Side by Side diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index a000e1fc1..619d7eb5a 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -62,6 +62,14 @@ if(ENABLE_OPENAL) add_definitions(-DAL_LIBTYPE_STATIC) endif() +if(ANDROID) + target_sources(audio_core PRIVATE + oboe_sink.cpp + oboe_sink.h + ) + target_link_libraries(audio_core PRIVATE oboe) +endif() + if (CITRA_USE_PRECOMPILED_HEADERS) target_precompile_headers(audio_core PRIVATE precompiled_headers.h) endif() diff --git a/src/audio_core/oboe_sink.cpp b/src/audio_core/oboe_sink.cpp new file mode 100644 index 000000000..06edc443f --- /dev/null +++ b/src/audio_core/oboe_sink.cpp @@ -0,0 +1,124 @@ +#include "oboe_sink.h" + +#include +#include + +#include "audio_core/audio_types.h" +#include "common/logging/log.h" + +namespace AudioCore { + +class OboeSink::Impl : public oboe::AudioStreamCallback { +public: + Impl() = default; + ~Impl() override { + // Destructor now ensures that the stream is properly stopped and closed + if (mStream && mStream->getState() != oboe::StreamState::Closed) { + mStream->stop(); + mStream->close(); + mStream.reset(); + } + } + + oboe::DataCallbackResult onAudioReady(oboe::AudioStream* oboeStream, void* audioData, + int32_t numFrames) override { + s16* outputBuffer = static_cast(audioData); + if (mCallback) { + mCallback(outputBuffer, static_cast(numFrames)); + } + return oboe::DataCallbackResult::Continue; + } + + void onErrorAfterClose(oboe::AudioStream* /* oboeStream */, oboe::Result error) override { + if (error == oboe::Result::ErrorDisconnected) { + LOG_INFO(Audio_Sink, "Restarting AudioStream after disconnect"); + start(); + } else { + LOG_CRITICAL(Audio_Sink, "Error after close: {}", error); + } + } + + bool start() { + if (mStream && mStream->getState() != oboe::StreamState::Closed) { + mStream->stop(); + mStream->close(); + } + if (mStream) { + mStream.reset(); + } + oboe::AudioStreamBuilder builder; + auto result = builder.setSharingMode(oboe::SharingMode::Exclusive) + ->setPerformanceMode(oboe::PerformanceMode::LowLatency) + ->setUsage(oboe::Usage::Game) + ->setFormat(oboe::AudioFormat::I16) + ->setSampleRate(mSampleRate) + ->setChannelCount(2) + ->setCallback(this) + ->openStream(mStream); + if (result != oboe::Result::OK) { + LOG_CRITICAL(Audio_Sink, "Error creating playback stream: {}", + oboe::convertToText(result)); + return false; + } + mSampleRate = mStream->getSampleRate(); + result = mStream->start(); + if (result != oboe::Result::OK) { + LOG_CRITICAL(Audio_Sink, "Error starting playback stream: {}", + oboe::convertToText(result)); + return false; + } + return true; + } + + void stop() { + if (mStream && mStream->getState() != oboe::StreamState::Closed) { + auto stopResult = mStream->stop(); + auto closeResult = mStream->close(); + if (stopResult != oboe::Result::OK) { + LOG_CRITICAL(Audio_Sink, "Error stopping playback stream: {}", + oboe::convertToText(stopResult)); + } + if (closeResult != oboe::Result::OK) { + LOG_CRITICAL(Audio_Sink, "Error closing playback stream: {}", + oboe::convertToText(closeResult)); + } + mStream.reset(); + } + } + + int32_t GetSampleRate() const { + return mSampleRate; + } + + void SetCallback(std::function cb) { + mCallback = cb; + } + +private: + std::shared_ptr mStream; + std::function mCallback; + int32_t mSampleRate = native_sample_rate; +}; + +OboeSink::OboeSink(std::string_view device_id) : impl(std::make_unique()) {} +OboeSink::~OboeSink() { + // Ensures resources are freed up when OboeSink is destroyed + if (impl) { + impl->stop(); + } +} + +unsigned int OboeSink::GetNativeSampleRate() const { + return impl->GetSampleRate(); +} + +void OboeSink::SetCallback(std::function cb) { + impl->SetCallback(cb); + impl->start(); +} + +std::vector ListOboeSinkDevices() { + return {"auto"}; +} + +} // namespace AudioCore diff --git a/src/audio_core/oboe_sink.h b/src/audio_core/oboe_sink.h new file mode 100644 index 000000000..4509c0e71 --- /dev/null +++ b/src/audio_core/oboe_sink.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include +#include +#include "audio_core/sink.h" + +namespace AudioCore { + +class OboeSink final : public Sink { +public: + explicit OboeSink(std::string_view device_id); + ~OboeSink() override; + + unsigned int GetNativeSampleRate() const override; + void SetCallback(std::function cb) override; + +private: + class Impl; + std::unique_ptr impl; +}; + +std::vector ListOboeSinkDevices(); + +} // namespace AudioCore diff --git a/src/audio_core/sink_details.cpp b/src/audio_core/sink_details.cpp index 961e040b3..b01f04f2a 100644 --- a/src/audio_core/sink_details.cpp +++ b/src/audio_core/sink_details.cpp @@ -8,6 +8,9 @@ #include #include "audio_core/null_sink.h" #include "audio_core/sink_details.h" +#ifdef ANDROID +#include "audio_core/oboe_sink.h" +#endif #ifdef HAVE_SDL2 #include "audio_core/sdl2_sink.h" #endif @@ -37,6 +40,13 @@ constexpr std::array sink_details = { }, &ListOpenALSinkDevices}, #endif +#ifdef ANDROID + SinkDetails{SinkType::Oboe, "Oboe", + [](std::string_view device_id) -> std::unique_ptr { + return std::make_unique(device_id); + }, + &ListOboeSinkDevices}, +#endif #ifdef HAVE_SDL2 SinkDetails{SinkType::SDL2, "SDL2", [](std::string_view device_id) -> std::unique_ptr { diff --git a/src/audio_core/sink_details.h b/src/audio_core/sink_details.h index 2a0d202a7..ed4f0d995 100644 --- a/src/audio_core/sink_details.h +++ b/src/audio_core/sink_details.h @@ -20,6 +20,7 @@ enum class SinkType : u32 { Cubeb = 2, OpenAL = 3, SDL2 = 4, + Oboe = 5, }; struct SinkDetails {