mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-09-10 11:36:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove alternative default device detection in Cubeb backend
Some checks failed
Generate Translation Template / Generate Translation Template (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm gcc (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Mac Intel (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Mac Apple Silicon (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Windows (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Windows Clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 FreeBSD (push) Has been cancelled
Details

Browse source 
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
This commit is contained in:
Marcin Serwin 2025-08-01 18:24:11 +02:00 • committed by Ani
commit e5537c1cb0
2 changed files with 3 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

84
rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp
View file

@ -90,11 +90,6 @@ bool CubebBackend::DefaultDeviceChanged()
} }
device_handle device = GetDevice(); device_handle device = GetDevice();
if (!device.handle)
{
Cubeb.error("Selected device not found. Trying alternative approach...");
device = GetDefaultDeviceAlt(m_sampling_rate, m_sample_size, m_channels);
}
return !device.handle || device.id != m_default_device; return !device.handle || device.id != m_default_device;
} }
@ -119,20 +114,9 @@ bool CubebBackend::Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize
if (!device.handle) if (!device.handle)
{ {
if (use_default_device) if (use_default_device) Cubeb.error("Opening default device failed");
{ else Cubeb.error("Device with id=%s not found", dev_id);
device = GetDefaultDeviceAlt(freq, sample_size, static_cast<u32>(ch_cnt)); return false;
if (!device.handle)
{
Cubeb.error("Cannot detect default device. Channel count detection unavailable.");
}
}
else
{
Cubeb.error("Device with id=%s not found", dev_id);
return false;
}
} }
if (device.ch_cnt == 0) if (device.ch_cnt == 0)
@ -358,68 +342,6 @@ CubebBackend::device_handle CubebBackend::GetDevice(std::string_view dev_id)
return result; return result;
}; };
CubebBackend::device_handle CubebBackend::GetDefaultDeviceAlt(AudioFreq freq, AudioSampleSize sample_size, u32 ch_cnt)
{
Cubeb.notice("Starting alternative search for default device with freq=%d, sample_size=%d and ch_cnt=%d", static_cast<u32>(freq), static_cast<u32>(sample_size), static_cast<u32>(ch_cnt));
cubeb_stream_params param =
{
.format = sample_size == AudioSampleSize::S16 ? CUBEB_SAMPLE_S16NE : CUBEB_SAMPLE_FLOAT32NE,
.rate = static_cast<u32>(freq),
.channels = static_cast<u32>(ch_cnt),
.layout = CUBEB_LAYOUT_UNDEFINED,
.prefs = CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING
};
u32 min_latency{};
if (int err = cubeb_get_min_latency(m_ctx, &param, &min_latency))
{
Cubeb.error("cubeb_get_min_latency() failed: %i", err);
min_latency = 100;
}
cubeb_stream* tmp_stream{};
static auto dummy_data_cb = [](cubeb_stream*, void*, void const*, void*, long) -> long { return 0; };
static auto dummy_state_cb = [](cubeb_stream*, void*, cubeb_state) {};
if (int err = cubeb_stream_init(m_ctx, &tmp_stream, "Default device detector", nullptr, nullptr, nullptr, &param, min_latency, dummy_data_cb, dummy_state_cb, nullptr))
{
Cubeb.error("cubeb_stream_init() failed: %i", err);
return {};
}
cubeb_device* crnt_dev{};
if (int err = cubeb_stream_get_current_device(tmp_stream, &crnt_dev); err != CUBEB_OK || !crnt_dev)
{
Cubeb.error("cubeb_stream_get_current_device() failed: err=%i, crnt_dev=%d", err, !!crnt_dev);
cubeb_stream_destroy(tmp_stream);
return {};
}
std::string out_dev_name;
if (crnt_dev->output_name)
{
out_dev_name = crnt_dev->output_name;
}
if (int err = cubeb_stream_device_destroy(tmp_stream, crnt_dev))
{
Cubeb.error("cubeb_stream_device_destroy() failed: %i", err);
}
cubeb_stream_destroy(tmp_stream);
if (out_dev_name.empty())
{
Cubeb.notice("No default device available");
return {};
}
return GetDevice(out_dev_name);
}
long CubebBackend::data_cb(cubeb_stream* stream, void* user_ptr, void const* /* input_buffer */, void* output_buffer, long nframes) long CubebBackend::data_cb(cubeb_stream* stream, void* user_ptr, void const* /* input_buffer */, void* output_buffer, long nframes)
{ {
if (nframes <= 0) if (nframes <= 0)

1
rpcs3/Emu/Audio/Cubeb/CubebBackend.h
View file

@ -61,5 +61,4 @@ private:
}; };
device_handle GetDevice(std::string_view dev_id = ""); device_handle GetDevice(std::string_view dev_id = "");
device_handle GetDefaultDeviceAlt(AudioFreq freq, AudioSampleSize sample_size, u32 ch_cnt);
}; };