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

Compilation fix 2

Browse source
This commit is contained in:
Nekotekina 2014-07-01 20:04:58 +04:00
parent 2eeab1feb0
commit 5f6a236550
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utilities/SQueue.h
View file

@ -125,12 +125,14 @@ public:
return m_data[(m_pos + pos) % SQSize]; return m_data[(m_pos + pos) % SQSize];
} }
T& PeekIfExist(T& def, u32 pos = 0) T& PeekIfExist(u32 pos = 0)
{ {
static T def_value;
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
if (m_count <= pos) if (m_count <= pos)
{ {
return def; return def_value;
} }
else else
{ {

2
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View file

@ -306,7 +306,7 @@ u32 vdecOpen(VideoDecoder* data)
while (true) while (true)
{ {
if (Emu.IsStopped() || vdec.job.PeekIfExist(VdecTask()).type == vdecClose) if (Emu.IsStopped() || vdec.job.PeekIfExist().type == vdecClose)
{ {
vdec.is_finished = true; vdec.is_finished = true;
LOG_WARNING(HLE, "vdecDecodeAu: aborted"); LOG_WARNING(HLE, "vdecDecodeAu: aborted");

2
rpcs3/Emu/SysCalls/Modules/cellVdec.h
View file

@ -647,6 +647,7 @@ struct CellVdecMpeg2Info
enum VdecJobType : u32 enum VdecJobType : u32
{ {
vdecInvalid,
vdecStartSeq, vdecStartSeq,
vdecEndSeq, vdecEndSeq,
vdecDecodeAu, vdecDecodeAu,
@ -675,6 +676,7 @@ struct VdecTask
} }
VdecTask() VdecTask()
: type(vdecInvalid)
{ {
} }
}; };