mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-16 16:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellAudioOut: simplify sound mode initialization

Browse Source
This commit is contained in:
Megamouse 2022-05-29 13:43:28 +02:00
parent 3402835c8e
commit 363808a57b
1 changed files with 34 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
View File

@ -33,8 +33,6 @@ void fmt_class_string<CellAudioOutError>::format(std::string& out, u64 arg)
audio_out_configuration::audio_out_configuration() audio_out_configuration::audio_out_configuration()
{ {
CellAudioOutSoundMode mode{};
audio_out& primary_output = out.at(CELL_AUDIO_OUT_PRIMARY); audio_out& primary_output = out.at(CELL_AUDIO_OUT_PRIMARY);
audio_out& secondary_output = out.at(CELL_AUDIO_OUT_SECONDARY); audio_out& secondary_output = out.at(CELL_AUDIO_OUT_SECONDARY);
@ -58,6 +56,22 @@ audio_out_configuration::audio_out_configuration()
if (supports_dts) cellSysutil.notice("cellAudioOut: found support for DTS 5.1 Ch."); if (supports_dts) cellSysutil.notice("cellAudioOut: found support for DTS 5.1 Ch.");
if (supports_ac3) cellSysutil.notice("cellAudioOut: found support for Dolby Digital 5.1 Ch."); if (supports_ac3) cellSysutil.notice("cellAudioOut: found support for Dolby Digital 5.1 Ch.");
const auto add_sound_mode = [](std::vector<CellAudioOutSoundMode>& sound_modes, u8 type, u8 channel, u8 fs, u32 layout)
{
CellAudioOutSoundMode mode{};
mode.type = type;
mode.channel = channel;
mode.fs = fs;
mode.layout = layout;
sound_modes.push_back(std::move(mode));
};
const auto add_sound_mode_to_both_outputs = [&](u8 type, u8 channel, u8 fs, u32 layout)
{
add_sound_mode(primary_modes, type, channel, fs, layout);
add_sound_mode(secondary_modes, type, channel, fs, layout);
};
// TODO: audio_format should be a bitmap, but we'll keep it simple for now (Linear PCM 2 Ch. 48 kHz should always exist) // TODO: audio_format should be a bitmap, but we'll keep it simple for now (Linear PCM 2 Ch. 48 kHz should always exist)
// TODO: more formats: // TODO: more formats:
// - Each LPCM with other sample frequencies (we currently only support 48 kHz) // - Each LPCM with other sample frequencies (we currently only support 48 kHz)
@ -73,57 +87,27 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_lpcm_2) // Linear PCM 2 Ch. if (supports_lpcm_2) // Linear PCM 2 Ch.
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH);
mode.channel = CELL_AUDIO_OUT_CHNUM_2;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
if (supports_lpcm_5_1) // Linear PCM 5.1 Ch. if (supports_lpcm_5_1) // Linear PCM 5.1 Ch.
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
if (supports_lpcm_7_1) // Linear PCM 7.1 Ch. if (supports_lpcm_7_1) // Linear PCM 7.1 Ch.
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_8, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy);
mode.channel = CELL_AUDIO_OUT_CHNUM_8;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
if (supports_dts) // DTS 5.1 Ch. if (supports_dts) // DTS 5.1 Ch.
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_DTS; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_DTS, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
if (supports_ac3) // Dolby Digital 5.1 Ch. if (supports_ac3) // Dolby Digital 5.1 Ch.
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_AC3; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_AC3, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
@ -132,13 +116,7 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_lpcm_2) if (supports_lpcm_2)
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH);
mode.channel = CELL_AUDIO_OUT_CHNUM_2;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
} }
@ -146,13 +124,7 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_lpcm_5_1) if (supports_lpcm_5_1)
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
} }
@ -160,13 +132,7 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_lpcm_7_1) if (supports_lpcm_7_1)
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_8, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy);
mode.channel = CELL_AUDIO_OUT_CHNUM_8;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
} }
@ -174,13 +140,7 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_dts) if (supports_dts)
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_DTS; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_DTS, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
} }
@ -188,37 +148,23 @@ audio_out_configuration::audio_out_configuration()
{ {
if (supports_ac3) if (supports_ac3)
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_AC3; add_sound_mode_to_both_outputs(CELL_AUDIO_OUT_CODING_TYPE_AC3, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr);
mode.channel = CELL_AUDIO_OUT_CHNUM_6;
mode.fs = CELL_AUDIO_OUT_FS_48KHZ;
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr;
primary_modes.push_back(mode);
secondary_modes.push_back(mode);
} }
break; break;
} }
} }
// Fallback to default sound mode if none was found // Fallback to default sound mode if none was found
if (primary_modes.empty() || secondary_modes.empty()) if (primary_modes.empty())
{ {
mode.type = CELL_AUDIO_OUT_CODING_TYPE_LPCM; add_sound_mode(primary_modes, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH);
mode.channel = CELL_AUDIO_OUT_CHNUM_2; cellSysutil.warning("cellAudioOut: using Linear PCM 2 Ch. fallback sound mode for primary output");
mode.fs = CELL_AUDIO_OUT_FS_48KHZ; }
mode.layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;
if (primary_modes.empty()) if (secondary_modes.empty())
{ {
primary_modes.push_back(mode); add_sound_mode(secondary_modes, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH);
cellSysutil.warning("cellAudioOut: using Linear PCM 2 Ch. fallback sound mode for primary output"); cellSysutil.warning("cellAudioOut: using Linear PCM 2 Ch. fallback sound mode for secondary output");
}
if (secondary_modes.empty())
{
secondary_modes.push_back(mode);
cellSysutil.warning("cellAudioOut: using Linear PCM 2 Ch. fallback sound mode for secondary output");
}
} }
// Pre-select the first available sound mode // Pre-select the first available sound mode