Skip to content

Development #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thurberdog wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Development #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
863ca13
Update GetThermal.pro
thurberdog Sep 13, 2021
2cebe21
Add files via upload
thurberdog Sep 14, 2021
b681e33
Add files via upload
thurberdog Sep 14, 2021
a252b63
Add files via upload
thurberdog Sep 14, 2021
dc0b1eb
Add files via upload
thurberdog Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GetThermal.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/libuvc/build/release/ -luvc
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/libuvc/build/debug/ -luvc
else:macos: LIBS += -L$$PWD/libuvc/build/ -luvc
else:unix: LIBS += -L$$PWD/libuvc/build/ -luvcstatic
else:unix: LIBS += -L$$PWD/libuvc/build/ -luvc

INCLUDEPATH += $$PWD/lepton_sdk/Inc \
$$PWD/libuvc/build/include \
Expand Down
6 changes: 3 additions & 3 deletions src/dataformatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void DataFormatter::FindMinMax(const uvc_frame_t *input, QPoint &minPoint, uint1
uint8_t bytes_per_pixel = 0;

switch (input->frame_format) {
case UVC_FRAME_FORMAT_Y16:
case UVC_FRAME_FORMAT_GRAY16:
bytes_per_pixel = 2;
break;
case UVC_FRAME_FORMAT_GRAY8:
Expand Down Expand Up @@ -95,7 +95,7 @@ void DataFormatter::FixedGain(uvc_frame_t *input_output, QPoint minpoint, ushort
uint8_t bytes_per_pixel = 0;

switch (input_output->frame_format) {
case UVC_FRAME_FORMAT_Y16:
case UVC_FRAME_FORMAT_GRAY16:
bytes_per_pixel = 2;
break;
case UVC_FRAME_FORMAT_GRAY8:
Expand Down Expand Up @@ -165,7 +165,7 @@ void DataFormatter::Colorize(const uvc_frame_t *input, QVideoFrame &output) cons
Q_ASSERT(output.pixelFormat() == QVideoFrame::Format_RGB32);

switch (input->frame_format) {
case UVC_FRAME_FORMAT_Y16:
case UVC_FRAME_FORMAT_GRAY16:
bytes_per_pixel = 2;
break;
case UVC_FRAME_FORMAT_GRAY8:
Expand Down
4 changes: 2 additions & 2 deletions src/uvcacquisition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,13 @@ void UvcAcquisition::setVideoFormat(const QVideoSurfaceFormat &format)
switch(format.pixelFormat())
{
case QVideoFrame::Format_YUV420P:
uvcFormat = UVC_FRAME_FORMAT_I420;
uvcFormat = UVC_FRAME_FORMAT_BA81;
break;
case QVideoFrame::Format_RGB24:
uvcFormat = UVC_FRAME_FORMAT_RGB;
break;
case QVideoFrame::Format_Y16:
uvcFormat = UVC_FRAME_FORMAT_Y16;
uvcFormat = UVC_FRAME_FORMAT_GRAY16;
break;
default:
uvcFormat = UVC_FRAME_FORMAT_UNKNOWN;
Expand Down