diff options
| author | Mat M <mathew1800@gmail.com> | 2017-05-27 21:39:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 21:39:03 -0400 |
| commit | 905232fd2b0f0545e524c4c34859bf62576e43f5 (patch) | |
| tree | 88d01f6fe28d6c1312eb19c68693aa3d728f66bf /Source/Core/AudioCommon | |
| parent | d4faa099d95edcc408d90fefb601999b1481d308 (diff) | |
| parent | d416cbd9ed5efb391ad65c36ded74c17ab713622 (diff) | |
Merge pull request #5313 from ligfx/addcubeb
Add CubebStream output backend and replace PortAudio for microphones
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.vcxproj | 4 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.vcxproj.filters | 8 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CubebStream.cpp | 112 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CubebStream.h | 32 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CubebUtils.cpp | 75 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CubebUtils.h | 14 |
8 files changed, 257 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index fea933e582..6fc5a70c84 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -5,6 +5,7 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/AlsaSoundStream.h" #include "AudioCommon/CoreAudioSoundStream.h" +#include "AudioCommon/CubebStream.h" #include "AudioCommon/Mixer.h" #include "AudioCommon/NullSoundStream.h" #include "AudioCommon/OpenALStream.h" @@ -30,7 +31,9 @@ static const int AUDIO_VOLUME_MAX = 100; void InitSoundStream() { std::string backend = SConfig::GetInstance().sBackend; - if (backend == BACKEND_OPENAL && OpenALStream::isValid()) + if (backend == BACKEND_CUBEB) + g_sound_stream = std::make_unique<CubebStream>(); + else if (backend == BACKEND_OPENAL && OpenALStream::isValid()) g_sound_stream = std::make_unique<OpenALStream>(); else if (backend == BACKEND_NULLSOUND) g_sound_stream = std::make_unique<NullSound>(); @@ -110,6 +113,7 @@ std::vector<std::string> GetSoundBackends() std::vector<std::string> backends; backends.push_back(BACKEND_NULLSOUND); + backends.push_back(BACKEND_CUBEB); if (XAudio2_7::isValid() || XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); if (AlsaSound::isValid()) @@ -131,6 +135,8 @@ bool SupportsDPL2Decoder(const std::string& backend) if (backend == BACKEND_OPENAL) return true; #endif + if (backend == BACKEND_CUBEB) + return true; if (backend == BACKEND_PULSEAUDIO) return true; return false; @@ -146,7 +152,8 @@ bool SupportsVolumeChanges(const std::string& backend) // FIXME: this one should ask the backend whether it supports it. // but getting the backend from string etc. is probably // too much just to enable/disable a stupid slider... - return backend == BACKEND_COREAUDIO || backend == BACKEND_OPENAL || backend == BACKEND_XAUDIO2; + return backend == BACKEND_COREAUDIO || backend == BACKEND_CUBEB || backend == BACKEND_OPENAL || + backend == BACKEND_XAUDIO2; } void UpdateSoundStream() diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index afc86a7222..2ccb711ee5 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -37,6 +37,8 @@ <ItemGroup> <ClCompile Include="aldlist.cpp" /> <ClCompile Include="AudioCommon.cpp" /> + <ClCompile Include="CubebStream.cpp" /> + <ClCompile Include="CubebUtils.cpp" /> <ClCompile Include="DPL2Decoder.cpp" /> <ClCompile Include="Mixer.cpp" /> <ClCompile Include="NullSoundStream.cpp" /> @@ -52,6 +54,8 @@ <ClInclude Include="AlsaSoundStream.h" /> <ClInclude Include="AudioCommon.h" /> <ClInclude Include="CoreAudioSoundStream.h" /> + <ClInclude Include="CubebStream.h" /> + <ClInclude Include="CubebUtils.h" /> <ClInclude Include="DPL2Decoder.h" /> <ClInclude Include="Mixer.h" /> <ClInclude Include="NullSoundStream.h" /> diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index 3103ad558e..7c3fe389ee 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -8,6 +8,7 @@ <ItemGroup> <ClCompile Include="aldlist.cpp" /> <ClCompile Include="AudioCommon.cpp" /> + <ClCompile Include="CubebUtils.cpp" /> <ClCompile Include="DPL2Decoder.cpp" /> <ClCompile Include="Mixer.cpp" /> <ClCompile Include="WaveFile.cpp" /> @@ -23,10 +24,14 @@ <ClCompile Include="XAudio2_7Stream.cpp"> <Filter>SoundStreams</Filter> </ClCompile> + <ClCompile Include="CubebStream.cpp"> + <Filter>SoundStreams</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="aldlist.h" /> <ClInclude Include="AudioCommon.h" /> + <ClInclude Include="CubebUtils.h" /> <ClInclude Include="DPL2Decoder.h" /> <ClInclude Include="Mixer.h" /> <ClInclude Include="WaveFile.h" /> @@ -57,6 +62,9 @@ <ClInclude Include="SoundStream.h"> <Filter>SoundStreams</Filter> </ClInclude> + <ClInclude Include="CubebStream.h"> + <Filter>SoundStreams</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Text Include="CMakeLists.txt" /> diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index 8f0a283db8..94eb45c9ed 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -1,5 +1,7 @@ set(SRCS AudioCommon.cpp + CubebStream.cpp + CubebUtils.cpp DPL2Decoder.cpp Mixer.cpp WaveFile.cpp @@ -76,4 +78,4 @@ elseif(APPLE) target_sources(audiocommon PRIVATE CoreAudioSoundStream.cpp) endif() -target_link_libraries(audiocommon PRIVATE SoundTouch) +target_link_libraries(audiocommon PRIVATE cubeb SoundTouch) diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp new file mode 100644 index 0000000000..c9052e29c9 --- /dev/null +++ b/Source/Core/AudioCommon/CubebStream.cpp @@ -0,0 +1,112 @@ +// Copyright 2017 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include <cubeb/cubeb.h> + +#include "AudioCommon/CubebStream.h" +#include "AudioCommon/CubebUtils.h" +#include "AudioCommon/DPL2Decoder.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" +#include "Common/Thread.h" +#include "Core/ConfigManager.h" + +// ~10 ms - needs to be at least 240 for surround +constexpr u32 BUFFER_SAMPLES = 512; + +long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void* /*input_buffer*/, + void* output_buffer, long num_frames) +{ + auto* self = static_cast<CubebStream*>(user_data); + + if (self->m_stereo) + { + self->m_mixer->Mix(static_cast<short*>(output_buffer), num_frames); + } + else + { + size_t required_capacity = num_frames * 2; + if (required_capacity > self->m_short_buffer.capacity() || + required_capacity > self->m_floatstereo_buffer.capacity()) + { + INFO_LOG(AUDIO, "Expanding conversion buffers size: %li frames", num_frames); + self->m_short_buffer.reserve(required_capacity); + self->m_floatstereo_buffer.reserve(required_capacity); + } + + self->m_mixer->Mix(self->m_short_buffer.data(), num_frames); + + // s16 to float + for (size_t i = 0; i < static_cast<size_t>(num_frames) * 2; ++i) + self->m_floatstereo_buffer[i] = self->m_short_buffer[i] / static_cast<float>(1 << 15); + + // DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR + DPL2Decode(self->m_floatstereo_buffer.data(), num_frames, static_cast<float*>(output_buffer)); + } + + return num_frames; +} + +void CubebStream::StateCallback(cubeb_stream* stream, void* user_data, cubeb_state state) +{ +} + +bool CubebStream::Start() +{ + m_ctx = CubebUtils::GetContext(); + if (!m_ctx) + return false; + + m_stereo = !SConfig::GetInstance().bDPL2Decoder; + + cubeb_stream_params params; + params.rate = m_mixer->GetSampleRate(); + if (m_stereo) + { + params.channels = 2; + params.format = CUBEB_SAMPLE_S16NE; + params.layout = CUBEB_LAYOUT_STEREO; + } + else + { + params.channels = 6; + params.format = CUBEB_SAMPLE_FLOAT32NE; + params.layout = CUBEB_LAYOUT_3F2_LFE; + } + + u32 minimum_latency = 0; + if (cubeb_get_min_latency(m_ctx.get(), params, &minimum_latency) != CUBEB_OK) + ERROR_LOG(AUDIO, "Error getting minimum latency"); + INFO_LOG(AUDIO, "Minimum latency: %i frames", minimum_latency); + + if (cubeb_stream_init(m_ctx.get(), &m_stream, "Dolphin Audio Output", nullptr, nullptr, nullptr, + ¶ms, std::max(BUFFER_SAMPLES, minimum_latency), DataCallback, + StateCallback, this) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error initializing cubeb stream"); + return false; + } + + if (cubeb_stream_start(m_stream) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error starting cubeb stream"); + return false; + } + return true; +} + +void CubebStream::Stop() +{ + if (cubeb_stream_stop(m_stream) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error stopping cubeb stream"); + } + cubeb_stream_destroy(m_stream); + m_ctx.reset(); +} + +void CubebStream::SetVolume(int volume) +{ + cubeb_stream_set_volume(m_stream, volume / 100.0f); +} diff --git a/Source/Core/AudioCommon/CubebStream.h b/Source/Core/AudioCommon/CubebStream.h new file mode 100644 index 0000000000..d0b153975e --- /dev/null +++ b/Source/Core/AudioCommon/CubebStream.h @@ -0,0 +1,32 @@ +// Copyright 2017 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +#include <cstddef> +#include <memory> + +#include "AudioCommon/SoundStream.h" + +#include <cubeb/cubeb.h> + +class CubebStream final : public SoundStream +{ +public: + bool Start() override; + void Stop() override; + void SetVolume(int) override; + +private: + bool m_stereo = false; + std::shared_ptr<cubeb> m_ctx; + cubeb_stream* m_stream = nullptr; + + std::vector<short> m_short_buffer; + std::vector<float> m_floatstereo_buffer; + + static long DataCallback(cubeb_stream* stream, void* user_data, const void* /*input_buffer*/, + void* output_buffer, long num_frames); + static void StateCallback(cubeb_stream* stream, void* user_data, cubeb_state state); +}; diff --git a/Source/Core/AudioCommon/CubebUtils.cpp b/Source/Core/AudioCommon/CubebUtils.cpp new file mode 100644 index 0000000000..07f4f530d6 --- /dev/null +++ b/Source/Core/AudioCommon/CubebUtils.cpp @@ -0,0 +1,75 @@ +// Copyright 2017 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include <cstdarg> +#include <cstddef> +#include <cstring> + +#include "AudioCommon/CubebUtils.h" +#include "Common/CommonPaths.h" +#include "Common/Logging/Log.h" +#include "Common/Logging/LogManager.h" +#include "Common/StringUtil.h" + +#include <cubeb/cubeb.h> + +static ptrdiff_t s_path_cutoff_point = 0; + +static void LogCallback(const char* format, ...) +{ + if (!LogManager::GetInstance()) + return; + + va_list args; + va_start(args, format); + + const char* filename = va_arg(args, const char*) + s_path_cutoff_point; + int lineno = va_arg(args, int); + std::string adapted_format = StripSpaces(format + strlen("%s:%d:")); + + LogManager::GetInstance()->LogWithFullPath(LogTypes::LNOTICE, LogTypes::AUDIO, filename, lineno, + adapted_format.c_str(), args); + va_end(args); +} + +static void DestroyContext(cubeb* ctx) +{ + cubeb_destroy(ctx); + if (cubeb_set_log_callback(CUBEB_LOG_DISABLED, nullptr) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error removing cubeb log callback"); + } +} + +std::shared_ptr<cubeb> CubebUtils::GetContext() +{ + static std::weak_ptr<cubeb> weak; + + std::shared_ptr<cubeb> shared = weak.lock(); + // Already initialized + if (shared) + return shared; + + const char* filename = __FILE__; + const char* match_point = strstr(filename, DIR_SEP "Source" DIR_SEP "Core" DIR_SEP); + if (match_point) + { + s_path_cutoff_point = match_point - filename + strlen(DIR_SEP "Externals" DIR_SEP); + } + if (cubeb_set_log_callback(CUBEB_LOG_NORMAL, LogCallback) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error setting cubeb log callback"); + } + + cubeb* ctx; + if (cubeb_init(&ctx, "Dolphin", nullptr) != CUBEB_OK) + { + ERROR_LOG(AUDIO, "Error initializing cubeb library"); + return nullptr; + } + INFO_LOG(AUDIO, "Cubeb initialized using %s backend", cubeb_get_backend_id(ctx)); + + weak = shared = {ctx, DestroyContext}; + return shared; +} diff --git a/Source/Core/AudioCommon/CubebUtils.h b/Source/Core/AudioCommon/CubebUtils.h new file mode 100644 index 0000000000..adf6c25484 --- /dev/null +++ b/Source/Core/AudioCommon/CubebUtils.h @@ -0,0 +1,14 @@ +// Copyright 2017 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +#include <memory> + +struct cubeb; + +namespace CubebUtils +{ +std::shared_ptr<cubeb> GetContext(); +} // namespace CubebUtils |
