ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash from null sample channel 

Certain games, such as Forza Motorsport 3, submit XMA data with the
stereo flag set with a null second channel. This falls back to mono
conversion when the second channel is null, preventing a crash.
This commit is contained in:
Philpax 2021-08-09 19:32:04 +02:00 committed by Gliniak
parent 64b336805e
commit e901567193
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/apu/xma_context.cc
View File

@ -872,7 +872,7 @@ void XmaContext::ConvertFrame(const uint8_t** samples, bool is_two_channel,
static_assert(kSamplesPerFrame % 8 == 0); static_assert(kSamplesPerFrame % 8 == 0);
const auto in_channel_0 = reinterpret_cast<const float*>(samples[0]); const auto in_channel_0 = reinterpret_cast<const float*>(samples[0]);
const __m128 scale_mm = _mm_set1_ps(scale); const __m128 scale_mm = _mm_set1_ps(scale);
if (is_two_channel) { if (is_two_channel && samples[1] != nullptr) {
const auto in_channel_1 = reinterpret_cast<const float*>(samples[1]); const auto in_channel_1 = reinterpret_cast<const float*>(samples[1]);
const __m128i shufmask = const __m128i shufmask =
_mm_set_epi8(14, 15, 6, 7, 12, 13, 4, 5, 10, 11, 2, 3, 8, 9, 0, 1); _mm_set_epi8(14, 15, 6, 7, 12, 13, 4, 5, 10, 11, 2, 3, 8, 9, 0, 1);