Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] xcb/pipewire/nfbc: use min and correct inverted logic

Browse Source
This commit is contained in:
Geoffrey McRae 2022-05-04 12:23:20 +10:00
parent d5e2689d64
commit 60834a5719
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
host/platform/Linux/capture/XCB/src/xcb.c
View File

@ -20,6 +20,7 @@
#include "interface/capture.h"
#include "interface/platform.h"
#include "common/util.h"
#include "common/option.h"
#include "common/debug.h"
#include "common/event.h"
@ -273,8 +274,8 @@ static CaptureResult xcb_waitFrame(CaptureFrame * frame,
frame->screenWidth = this->width;
frame->screenHeight = this->height;
frame->frameWidth = this->width;
frame->frameHeight = maxHeight > this->height ? this->height : maxHeight;
frame->truncated = maxHeight > this->height;
frame->frameHeight = min(maxHeight, this->height);
frame->truncated = maxHeight < this->height;
frame->pitch = this->width * 4;
frame->stride = this->width;
frame->format = CAPTURE_FMT_BGRA;

4
host/platform/Linux/capture/pipewire/src/pipewire.c
View File

@ -428,8 +428,8 @@ static CaptureResult pipewire_waitFrame(CaptureFrame * frame,
frame->screenWidth = this->width;
frame->screenHeight = this->height;
frame->frameWidth = this->width;
frame->frameHeight = maxHeight > this->height ? this->height : maxHeight;
frame->truncated = maxHeight > this->height;
frame->frameHeight = min(maxHeight, this->height);
frame->truncated = maxHeight < this->height;
frame->pitch = this->width * bpp;
frame->stride = this->width;
frame->rotation = CAPTURE_ROT_0;

4
host/platform/Windows/capture/NVFBC/src/nvfbc.c
View File

@ -23,6 +23,7 @@
#include "common/windebug.h"
#include "windows/mousehook.h"
#include "windows/force_compose.h"
#include "common/util.h"
#include "common/array.h"
#include "common/option.h"
#include "common/framebuffer.h"
@ -560,8 +561,7 @@ static CaptureResult nvfbc_waitFrame(CaptureFrame * frame,
frame->screenWidth = this->grabWidth;
frame->screenHeight = this->grabHeight;
frame->frameWidth = this->grabWidth;
frame->frameHeight = maxHeight < this->grabHeight ?
maxHeight : this->grabHeight;
frame->frameHeight = min(maxHeight, this->grabHeight);
frame->truncated = maxHeight < this->grabHeight;
frame->pitch = this->shmStride * 4;
frame->stride = this->shmStride;