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

cellVdec mem limit

Browse source
This commit is contained in:
Nekotekina 2017-01-30 01:50:20 +03:00
parent aef5113d49
commit c733d03525
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/Cell/Modules/cellVdec.cpp
View file

@ -14,7 +14,6 @@ extern "C"
#include "cellVdec.h" #include "cellVdec.h"
#include <mutex> #include <mutex>
#include <thread>
#include <queue> #include <queue>
#include <cmath> #include <cmath>
@ -77,7 +76,6 @@ struct vdec_thread : ppu_thread
std::mutex mutex; std::mutex mutex;
std::queue<vdec_frame> out; std::queue<vdec_frame> out;
std::queue<u64> user_data; // TODO
vdec_thread(s32 type, u32 profile, u32 addr, u32 size, vm::ptr<CellVdecCbMsg> func, u32 arg) vdec_thread(s32 type, u32 profile, u32 addr, u32 size, vm::ptr<CellVdecCbMsg> func, u32 arg)
: ppu_thread("HLE Video Decoder") : ppu_thread("HLE Video Decoder")
@ -338,6 +336,12 @@ struct vdec_thread : ppu_thread
} }
cb_func(*this, id, vcmd == vdec_cmd::decode ? CELL_VDEC_MSG_TYPE_AUDONE : CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, cb_arg); cb_func(*this, id, vcmd == vdec_cmd::decode ? CELL_VDEC_MSG_TYPE_AUDONE : CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, cb_arg);
while (std::lock_guard<std::mutex>{mutex}, out.size() > 60)
{
thread_ctrl::wait();
}
break; break;
} }
@ -525,6 +529,11 @@ s32 cellVdecGetPicture(u32 handle, vm::cptr<CellVdecPicFormat> format, vm::ptr<u
frame = std::move(vdec->out.front()); frame = std::move(vdec->out.front());
vdec->out.pop(); vdec->out.pop();
if (vdec->out.size() <= 60)
{
vdec->notify();
}
} }
vdec->notify(); vdec->notify();