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

Audio Mixer: Corrects reversed stereo in LLE and reversed stereo from DMA audio in HLE. 

Fixes Issue 3713

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6835 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
mylek4 2011-01-12 21:21:15 +00:00
parent b15efb4d03
commit 343771d392
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/AudioCommon/Src/Mixer.cpp
View File

@ -25,7 +25,7 @@
#include <tmmintrin.h> #include <tmmintrin.h>
#endif #endif
static const __m128i sr_mask = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L); static const __m128i sr_mask = _mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL, 0x04050607L, 0x00010203L);
// Executed from sound stream thread // Executed from sound stream thread
unsigned int CMixer::Mix(short* samples, unsigned int numSamples) unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
@ -71,9 +71,10 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
else else
#endif #endif
{ {
for (unsigned int i = 0; i < numLeft * 2; i++) for (unsigned int i = 0; i < numLeft * 2; i+=2)
{ {
samples[i] = Common::swap16(m_buffer[(m_indexR + i) & INDEX_MASK]); samples[i] = Common::swap16(m_buffer[(m_indexR + i + 1) & INDEX_MASK]);
samples[i+1] = Common::swap16(m_buffer[(m_indexR + i) & INDEX_MASK]);
} }
} }
m_indexR += numLeft * 2; m_indexR += numLeft * 2;
@ -96,12 +97,12 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
s16 l1 = Common::swap16(m_buffer[m_indexR & INDEX_MASK]); //current s16 l1 = Common::swap16(m_buffer[m_indexR & INDEX_MASK]); //current
s16 l2 = Common::swap16(m_buffer[m_indexR2 & INDEX_MASK]); //next s16 l2 = Common::swap16(m_buffer[m_indexR2 & INDEX_MASK]); //next
int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16; int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16;
samples[i] = sampleL; samples[i+1] = sampleL;
s16 r1 = Common::swap16(m_buffer[(m_indexR + 1) & INDEX_MASK]); //current s16 r1 = Common::swap16(m_buffer[(m_indexR + 1) & INDEX_MASK]); //current
s16 r2 = Common::swap16(m_buffer[(m_indexR2 + 1) & INDEX_MASK]); //next s16 r2 = Common::swap16(m_buffer[(m_indexR2 + 1) & INDEX_MASK]); //next
int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac) >> 16; int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac) >> 16;
samples[i+1] = sampleR; samples[i] = sampleR;
frac += ratio; frac += ratio;
m_indexR += 2 * (u16)(frac >> 16); m_indexR += 2 * (u16)(frac >> 16);