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

cellCamera: fix qt camera width and height for non-default resolutions

Browse source
This commit is contained in:
Megamouse 2021-10-17 12:38:09 +02:00
parent 08011e9b78
commit 3fac832567
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Emu/Cell/Modules/cellCamera.cpp
View file

@ -1217,6 +1217,7 @@ error_code cellCameraStart(s32 dev_num)
{ {
g_camera.handler->set_mirrored(!!g_camera.attr[CELL_CAMERA_MIRRORFLAG].v1); g_camera.handler->set_mirrored(!!g_camera.attr[CELL_CAMERA_MIRRORFLAG].v1);
g_camera.handler->set_frame_rate(g_camera.info.framerate); g_camera.handler->set_frame_rate(g_camera.info.framerate);
g_camera.handler->set_resolution(g_camera.info.width, g_camera.info.height);
atomic_t<bool> wake_up = false; atomic_t<bool> wake_up = false;

5
rpcs3/rpcs3qt/qt_camera_video_surface.cpp
View file

@ -248,6 +248,11 @@ void qt_camera_video_surface::get_image(u8* buf, u64 size, u32& width, u32& heig
{ {
bytes_read = std::min<u64>(image_buffer.size, size); bytes_read = std::min<u64>(image_buffer.size, size);
std::memcpy(buf, image_buffer.data, bytes_read); std::memcpy(buf, image_buffer.data, bytes_read);
if (image_buffer.size != size)
{
camera_log.error("Buffer size mismatch: in=%d, out=%d. Cropping to incoming size. Please contact a developer.", size, image_buffer.size);
}
} }
else else
{ {