archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cellAdecClose, cellVdecClose fix

Browse source
This commit is contained in:
Nekotekina 2014-10-18 02:20:03 +04:00
parent 18930a43f2
commit 318d06efda
8 changed files with 401 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
View file

@ -105,9 +105,9 @@ int cellAudioInit()
float* oal_buffer_float = nullptr;
if (g_is_u16)
queue.Pop(oal_buffer);
queue.Pop(oal_buffer, nullptr);
else
queue_float.Pop(oal_buffer_float);
queue_float.Pop(oal_buffer_float, nullptr);
if (g_is_u16)
{
@ -153,7 +153,6 @@ int cellAudioInit()
m_config.counter++;
const u32 oal_pos = m_config.counter % BUFFER_NUM;
const u32 oal_pos_float = m_config.counter % BUFFER_NUM;
if (Emu.IsPaused())
{
@ -350,10 +349,10 @@ int cellAudioInit()
_mm_cvtps_epi32(_mm_mul_ps((__m128&)(buf2ch[i + 4]), float2u16)));
}
}
else
for (u32 i = 0; i < (sizeof(buf2ch) / sizeof(float)); i++)
{
oal_buffer_float[oal_pos_float][oal_buffer_offset + i] = buf2ch[i];
oal_buffer_float[oal_pos][oal_buffer_offset + i] = buf2ch[i];
}
}
@ -361,8 +360,8 @@ int cellAudioInit()
if (first_mix)
{
memset(&oal_buffer[oal_pos][0], 0, oal_buffer_size * sizeof(s16));
memset(&oal_buffer_float[oal_pos_float][0], 0, oal_buffer_size * sizeof(float));
if (g_is_u16) memset(&oal_buffer[oal_pos][0], 0, oal_buffer_size * sizeof(s16));
else memset(&oal_buffer_float[oal_pos][0], 0, oal_buffer_size * sizeof(float));
}
oal_buffer_offset += sizeof(buf2ch) / sizeof(float);
@ -371,9 +370,9 @@ int cellAudioInit()
if(m_audio_out)
{
if (g_is_u16)
queue.Push(&oal_buffer[oal_pos][0]);
queue.Push(&oal_buffer[oal_pos][0], nullptr);
queue_float.Push(&oal_buffer_float[oal_pos_float][0]);
queue_float.Push(&oal_buffer_float[oal_pos][0], nullptr);
}
oal_buffer_offset = 0;
@ -439,8 +438,8 @@ int cellAudioInit()
}
cellAudio->Notice("Audio thread ended");
abort:
queue.Push(nullptr);
queue_float.Push(nullptr);
queue.Push(nullptr, nullptr);
queue_float.Push(nullptr, nullptr);
if(do_dump)
m_dump.Finalize();