From 863ca13ac8eb87fb8f882bc077d0c8c640c9eb95 Mon Sep 17 00:00:00 2001 From: Louis Meadows Date: Mon, 13 Sep 2021 13:49:54 -0700 Subject: [PATCH 1/5] Update GetThermal.pro --- GetThermal.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetThermal.pro b/GetThermal.pro index 5d0a1f8..90ade5c 100644 --- a/GetThermal.pro +++ b/GetThermal.pro @@ -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 \ From 2cebe2129ee12e81c66991b0a62090e672ac3a91 Mon Sep 17 00:00:00 2001 From: Louis Meadows Date: Tue, 14 Sep 2021 13:05:57 -0700 Subject: [PATCH 2/5] Add files via upload From b681e33668610731d3f2fa0e14b38b1d4d95b9f4 Mon Sep 17 00:00:00 2001 From: Louis Meadows Date: Tue, 14 Sep 2021 13:06:38 -0700 Subject: [PATCH 3/5] Add files via upload From a252b6315888b9caf25f0ab590fbfa858dc6f81f Mon Sep 17 00:00:00 2001 From: Louis Meadows Date: Tue, 14 Sep 2021 13:07:32 -0700 Subject: [PATCH 4/5] Add files via upload From dc0b1ebfa578031da8f9b7644a443c4fca84601d Mon Sep 17 00:00:00 2001 From: Louis Meadows Date: Tue, 14 Sep 2021 13:08:59 -0700 Subject: [PATCH 5/5] Add files via upload --- src/dataformatter.cpp | 6 +++--- src/uvcacquisition.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dataformatter.cpp b/src/dataformatter.cpp index fcfa76a..667e0fe 100644 --- a/src/dataformatter.cpp +++ b/src/dataformatter.cpp @@ -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: @@ -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: @@ -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: diff --git a/src/uvcacquisition.cpp b/src/uvcacquisition.cpp index 0075b61..953c42e 100644 --- a/src/uvcacquisition.cpp +++ b/src/uvcacquisition.cpp @@ -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;