RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 12:42:41 +01:00
Code Issues Releases Wiki Activity

cellCamera: fix camera interaction

Browse Source
This commit is contained in:
Megamouse 2021-10-17 21:22:26 +02:00
parent bf71b1fcf7
commit 843aed228e
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,14 +555,13 @@ error_code cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
std::tie(info->width, info->height) = get_video_resolution(*info); std::tie(info->width, info->height) = get_video_resolution(*info);
g_camera.handler.reset();
g_camera.handler = Emu.GetCallbacks().get_camera_handler();
atomic_t<bool> wake_up = false; atomic_t<bool> wake_up = false;
Emu.CallAfter([&wake_up, handler = g_camera.handler]() Emu.CallAfter([&wake_up, &g_camera]()
{ {
handler->open_camera(); g_camera.handler.reset();
g_camera.handler = Emu.GetCallbacks().get_camera_handler();
g_camera.handler->open_camera();
wake_up = true; wake_up = true;
wake_up.notify_one(); wake_up.notify_one();
}); });
@ -614,6 +613,7 @@ error_code cellCameraClose(s32 dev_num)
auto& g_camera = g_fxo->get<camera_thread>(); auto& g_camera = g_fxo->get<camera_thread>();
std::lock_guard lock(g_camera.mutex); std::lock_guard lock(g_camera.mutex);
g_camera.is_streaming = false;
vm::dealloc(g_camera.info.buffer.addr(), vm::main); vm::dealloc(g_camera.info.buffer.addr(), vm::main);
@ -1340,11 +1340,12 @@ error_code cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read)
u64 bytes_read{}; u64 bytes_read{};
atomic_t<bool> wake_up = false; atomic_t<bool> wake_up = false;
camera_handler_base::camera_handler_state result = camera_handler_base::camera_handler_state::not_available; error_code error = CELL_OK;
Emu.CallAfter([&]() Emu.CallAfter([&]()
{ {
result = g_camera.handler->get_image(g_camera.info.buffer.get_ptr(), g_camera.info.bytesize, width, height, frame_number, bytes_read); camera_handler_base::camera_handler_state result = g_camera.handler->get_image(g_camera.info.buffer.get_ptr(), g_camera.info.bytesize, width, height, frame_number, bytes_read);
error = g_camera.on_handler_state(result);
wake_up = true; wake_up = true;
wake_up.notify_one(); wake_up.notify_one();
}); });
@ -1354,7 +1355,7 @@ error_code cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read)
thread_ctrl::wait_on(wake_up, false); thread_ctrl::wait_on(wake_up, false);
} }
if (error_code error = g_camera.on_handler_state(result); error != CELL_OK) if (error != CELL_OK)
{ {
return error; return error;
} }
@ -1640,7 +1641,7 @@ void camera_context::operator()()
u64 frame_number{}; u64 frame_number{};
u64 bytes_read{}; u64 bytes_read{};
result = handler->get_image(info.pbuf[pbuf_write_index].get_ptr(), info.bytesize, width, height, frame_number, bytes_read); result = handler->get_image(info.pbuf[pbuf_write_index].get_ptr(), info.bytesize, width, height, frame_number, bytes_read);
send_frame_update_event = on_handler_state(result) = CELL_OK;
wake_up = true; wake_up = true;
wake_up.notify_one(); wake_up.notify_one();
}); });
@ -1650,14 +1651,27 @@ void camera_context::operator()()
thread_ctrl::wait_on(wake_up, false); thread_ctrl::wait_on(wake_up, false);
} }
pbuf_write_index = pbuf_next_index(); if (send_frame_update_event)
{
send_frame_update_event = on_handler_state(result) = CELL_OK; pbuf_write_index = pbuf_next_index();
}
} }
} }
else else
{ {
send_frame_update_event = on_handler_state(handler->get_state()) = CELL_OK; atomic_t<bool> wake_up = false;
Emu.CallAfter([&]()
{
send_frame_update_event = on_handler_state(handler->get_state()) = CELL_OK;
wake_up = true;
wake_up.notify_one();
});
while (!wake_up && !Emu.IsStopped())
{
thread_ctrl::wait_on(wake_up, false);
}
} }
} }
@ -1827,6 +1841,7 @@ error_code camera_context::on_handler_state(camera_handler_base::camera_handler_
if (is_streaming) if (is_streaming)
{ {
cellCamera.warning("Camera closed or disconnected (state=%d). Trying to start camera...", static_cast<int>(state)); cellCamera.warning("Camera closed or disconnected (state=%d). Trying to start camera...", static_cast<int>(state));
handler->open_camera();
handler->start_camera(); handler->start_camera();
} }
else if (is_open) else if (is_open)

7
rpcs3/rpcs3qt/qt_camera_handler.cpp
View File

@ -88,6 +88,7 @@ void qt_camera_handler::open_camera()
if (m_camera->state() != QCamera::State::UnloadedState) if (m_camera->state() != QCamera::State::UnloadedState)
{ {
camera_log.notice("Camera already loaded"); camera_log.notice("Camera already loaded");
return;
} }
// Load/open camera // Load/open camera
@ -125,6 +126,7 @@ void qt_camera_handler::close_camera()
if (m_camera->state() == QCamera::State::UnloadedState) if (m_camera->state() == QCamera::State::UnloadedState)
{ {
camera_log.notice("Camera already unloaded"); camera_log.notice("Camera already unloaded");
return;
} }
// Unload/close camera // Unload/close camera
@ -145,8 +147,10 @@ void qt_camera_handler::start_camera()
if (m_camera->state() == QCamera::State::ActiveState) if (m_camera->state() == QCamera::State::ActiveState)
{ {
camera_log.notice("Camera already started"); camera_log.notice("Camera already started");
return;
} }
else if (m_camera->state() == QCamera::State::UnloadedState)
if (m_camera->state() == QCamera::State::UnloadedState)
{ {
camera_log.notice("Camera not open"); camera_log.notice("Camera not open");
open_camera(); open_camera();
@ -170,6 +174,7 @@ void qt_camera_handler::stop_camera()
if (m_camera->state() == QCamera::State::LoadedState) if (m_camera->state() == QCamera::State::LoadedState)
{ {
camera_log.notice("Camera already stopped"); camera_log.notice("Camera already stopped");
return;
} }
// Stop camera. The camera will still be drawing power. // Stop camera. The camera will still be drawing power.