diff --git a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengine.dll b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengine.dll index 49e2428f0191ece1c613867a2034b7f8e4152d23..51d0b35e6f7229b7614b66b1d2351f4110d35276 100644 Binary files a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengine.dll and b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengine.dll differ diff --git a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.dll b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.dll index d8bae2d1f1ec63126c07dd71638a1a1507bb9c83..7a26d61ffc365627ef720ae82177fd42ee10aa2f 100644 Binary files a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.dll and b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.dll differ diff --git a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.pdb b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.pdb index 1ae2b4171172b0e6d1e8fb18b5a25a90e4b5d9a5..237ea780e7d2823c513e5a55cd4e4d5111c7bac1 100644 Binary files a/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.pdb and b/EyeRecToo/deps/runtime/x64/Debug/plugins/mediaservice/uvcengined.pdb differ diff --git a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengine.dll b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengine.dll index 49e2428f0191ece1c613867a2034b7f8e4152d23..51d0b35e6f7229b7614b66b1d2351f4110d35276 100644 Binary files a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengine.dll and b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengine.dll differ diff --git a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.dll b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.dll index d8bae2d1f1ec63126c07dd71638a1a1507bb9c83..7a26d61ffc365627ef720ae82177fd42ee10aa2f 100644 Binary files a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.dll and b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.dll differ diff --git a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.pdb b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.pdb index 1ae2b4171172b0e6d1e8fb18b5a25a90e4b5d9a5..237ea780e7d2823c513e5a55cd4e4d5111c7bac1 100644 Binary files a/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.pdb and b/EyeRecToo/deps/runtime/x64/Release/plugins/mediaservice/uvcengined.pdb differ diff --git a/EyeRecToo/src/FrameGrabber.cpp b/EyeRecToo/src/FrameGrabber.cpp index 3eaf5ab017f012b5f57acefd1f054cd122b1482f..eb70a7b4d82806afa32bd04c4f23950db30eaf6a 100644 --- a/EyeRecToo/src/FrameGrabber.cpp +++ b/EyeRecToo/src/FrameGrabber.cpp @@ -11,19 +11,15 @@ FrameGrabber::FrameGrabber(QString id, int code, QObject* parent) , code(code) , yuvBuffer(nullptr) , yuvBufferSize(0) + , watchdog(new QTimer(this)) , timeoutMs(2e3) { #ifdef TURBOJPEG tjh = tjInitDecompress(); #endif - watchdog = new QTimer(this); connect(watchdog, SIGNAL(timeout()), this, SIGNAL(timedout())); - // for the first frame, we give a bit of extra leeway becase gstreamer is slow... - //watchdog->start(timeoutMs); - watchdog->start(15e3); - pmIdx = gPerformanceMonitor.enrol(id, "Frame Grabber"); } @@ -160,7 +156,7 @@ void FrameGrabber::setColorCode(int code) bool FrameGrabber::jpeg2bmp(const QVideoFrame& in, cv::Mat& cvFrame) { - unsigned char* frame = const_cast(in.bits()); + auto frame = const_cast(in.bits()); int len = in.mappedBytes(); #ifdef TURBOJPEG diff --git a/EyeRecToo/src/utils.cpp b/EyeRecToo/src/utils.cpp index 2b3089f6c8afec21b03a44f6d3ae90d04fcfec0d..2a171a8525dde07b805252b78c09e72bc9550127 100644 --- a/EyeRecToo/src/utils.cpp +++ b/EyeRecToo/src/utils.cpp @@ -9,7 +9,7 @@ const char Token::HeaderEntry = 'H'; const char Token::MarkerIdDelimiter = ':'; const char Token::MarkerValueDelimiter = 'x'; const char Token::MarkerEnd = ';'; -const int Token::Precision = 6; +const int Token::Precision = 4; const Timestamp maxTimestamp = std::numeric_limits::max(); diff --git a/EyeRecToo/src/utils.h b/EyeRecToo/src/utils.h index b1cbe6448a8dd5c96f39aa490647010f64095a9b..03b99ade252c297e1654bc090bb9660de866bb63 100644 --- a/EyeRecToo/src/utils.h +++ b/EyeRecToo/src/utils.h @@ -47,7 +47,7 @@ inline QString journalField(const T& v) template <> inline QString journalField(const double& v) { - return QString("%1%2").arg(v, 0, 'g', Token::Precision).arg(Token::Delimiter); + return QString("%1%2").arg(v, 0, 'f', Token::Precision).arg(Token::Delimiter); } template <> inline QString journalField(const float& v)