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

Fix libcamera regression

This commit is contained in:
eladash 2018-11-09 10:11:38 +02:00 committed by Ivan
parent 634a5fa31c
commit 3c7f02d99d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/Cell/Modules/cellCamera.cpp
View File

@ -1160,14 +1160,16 @@ void camera_context::operator()()
{ {
while (fxm::check<camera_thread>() == this && !Emu.IsStopped()) while (fxm::check<camera_thread>() == this && !Emu.IsStopped())
{ {
const u64 frame_start = get_system_time(); const s32 fps = info.framerate;
if (Emu.IsPaused()) if (!fps || Emu.IsPaused())
{ {
thread_ctrl::wait_for(1000); // hack thread_ctrl::wait_for(1000); // hack
continue; continue;
} }
const u64 frame_start = get_system_time();
std::unique_lock lock(mutex_notify_data_map); std::unique_lock lock(mutex_notify_data_map);
for (auto const& notify_data_entry : notify_data_map) for (auto const& notify_data_entry : notify_data_map)
@ -1176,9 +1178,7 @@ void camera_context::operator()()
const auto& evt_data = notify_data_entry.second; const auto& evt_data = notify_data_entry.second;
// handle FRAME_UPDATE // handle FRAME_UPDATE
if (is_streaming && if (is_streaming && evt_data.flag & CELL_CAMERA_EFLAG_FRAME_UPDATE)
evt_data.flag & CELL_CAMERA_EFLAG_FRAME_UPDATE &&
info.framerate != 0)
{ {
if (auto queue = lv2_event_queue::find(key)) if (auto queue = lv2_event_queue::find(key))
{ {
@ -1211,7 +1211,7 @@ void camera_context::operator()()
lock.unlock(); lock.unlock();
for (const u64 frame_target_time = 1000000u / info.framerate;;) for (const u64 frame_target_time = 1000000u / fps;;)
{ {
const u64 time_passed = get_system_time() - frame_start; const u64 time_passed = get_system_time() - frame_start;
if (time_passed >= frame_target_time) if (time_passed >= frame_target_time)