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

Little fix

Browse Source
This commit is contained in:
Nekotekina 2014-03-31 10:19:51 +04:00
parent 2d955dc297
commit 9afbbfad0a
3 changed files with 258 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
View File

@ -140,6 +140,9 @@ int cellAudioInit()
auto buf = (be_t<float>*)&Memory[buf_addr]; auto buf = (be_t<float>*)&Memory[buf_addr];
static const float k = 1.0f;
const float m = (port.level == 0.0f) ? 1.0f : port.level;
if (port.channel == 2) if (port.channel == 2)
{ {
if (first_mix) if (first_mix)
@ -147,8 +150,7 @@ int cellAudioInit()
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i++) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i++)
{ {
// reverse byte order // reverse byte order
buffer[i] = buf[i]; buffer[i] = buf[i] * m;
// TODO: use port.m_param.level
} }
first_mix = false; first_mix = false;
} }
@ -156,7 +158,7 @@ int cellAudioInit()
{ {
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i++) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i++)
{ {
buffer[i] += buf[i]; buffer[i] += buf[i] * m;
} }
} }
} }
@ -167,8 +169,8 @@ int cellAudioInit()
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2)
{ {
const float center = (buf[i*3+2] + buf[i*3+3]) * 0.708f; const float center = (buf[i*3+2] + buf[i*3+3]) * 0.708f;
buffer[i] = (buf[i*3] + buf[i*3+4] + center) * 0.5f; buffer[i] = (buf[i*3] + buf[i*3+4] + center) * k * m;
buffer[i+1] = (buf[i*3+1] + buf[i*3+5] + center) * 0.5f; buffer[i+1] = (buf[i*3+1] + buf[i*3+5] + center) * k * m;
} }
first_mix = false; first_mix = false;
} }
@ -177,8 +179,8 @@ int cellAudioInit()
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2)
{ {
const float center = (buf[i*3+2] + buf[i*3+3]) * 0.708f; const float center = (buf[i*3+2] + buf[i*3+3]) * 0.708f;
buffer[i] += (buf[i*3] + buf[i*3+4] + center) * 0.5f; buffer[i] += (buf[i*3] + buf[i*3+4] + center) * k * m;
buffer[i+1] += (buf[i*3+1] + buf[i*3+5] + center) * 0.5f; buffer[i+1] += (buf[i*3+1] + buf[i*3+5] + center) * k * m;
} }
} }
} }
@ -189,8 +191,8 @@ int cellAudioInit()
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2)
{ {
const float center = (buf[i*4+2] + buf[i*4+3]) * 0.708f; const float center = (buf[i*4+2] + buf[i*4+3]) * 0.708f;
buffer[i] = (buf[i*4] + buf[i*4+4] + buf[i*4+6] + center) * 0.5f; buffer[i] = (buf[i*4] + buf[i*4+4] + buf[i*4+6] + center) * k * m;
buffer[i+1] = (buf[i*4+1] + buf[i*4+5] + buf[i*4+7] + center) * 0.5f; buffer[i+1] = (buf[i*4+1] + buf[i*4+5] + buf[i*4+7] + center) * k * m;
} }
first_mix = false; first_mix = false;
} }
@ -199,8 +201,8 @@ int cellAudioInit()
for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2) for (u32 i = 0; i < (sizeof(buffer) / sizeof(float)); i += 2)
{ {
const float center = (buf[i*4+2] + buf[i*4+3]) * 0.708f; const float center = (buf[i*4+2] + buf[i*4+3]) * 0.708f;
buffer[i] += (buf[i*4] + buf[i*4+4] + buf[i*4+6] + center) * 0.5f; buffer[i] += (buf[i*4] + buf[i*4+4] + buf[i*4+6] + center) * k * m;
buffer[i+1] += (buf[i*4+1] + buf[i*4+5] + buf[i*4+7] + center) * 0.5f; buffer[i+1] += (buf[i*4+1] + buf[i*4+5] + buf[i*4+7] + center) * k * m;
} }
} }
} }

8
rpcs3/Emu/SysCalls/Modules/libmixer.cpp
View File

@ -55,8 +55,8 @@ int cellAANAddData(u32 aan_handle, u32 aan_port, u32 offset, u32 addr, u32 sampl
for (u32 i = 0; i < samples; i++) for (u32 i = 0; i < samples; i++)
{ {
const float center = *(be_t<float>*)&Memory[addr + i * sizeof(float)]; const float center = *(be_t<float>*)&Memory[addr + i * sizeof(float)];
mixdata[i*8+0] += center * 2; mixdata[i*8+0] += center;
mixdata[i*8+1] += center * 2; mixdata[i*8+1] += center;
} }
} }
else if (ch == 2) else if (ch == 2)
@ -66,8 +66,8 @@ int cellAANAddData(u32 aan_handle, u32 aan_port, u32 offset, u32 addr, u32 sampl
{ {
const float left = *(be_t<float>*)&Memory[addr + i * 2 * sizeof(float)]; const float left = *(be_t<float>*)&Memory[addr + i * 2 * sizeof(float)];
const float right = *(be_t<float>*)&Memory[addr + (i * 2 + 1) * sizeof(float)]; const float right = *(be_t<float>*)&Memory[addr + (i * 2 + 1) * sizeof(float)];
mixdata[i*8+0] += left * 2; mixdata[i*8+0] += left;
mixdata[i*8+1] += right * 2; mixdata[i*8+1] += right;
} }
} }
else if (ch == 6) else if (ch == 6)