diff --git a/include/grabber/video/mediafoundation/MFGrabber.h b/include/grabber/video/mediafoundation/MFGrabber.h index 30142069..7ece840c 100644 --- a/include/grabber/video/mediafoundation/MFGrabber.h +++ b/include/grabber/video/mediafoundation/MFGrabber.h @@ -98,17 +98,17 @@ private: void start_capturing(); void process_image(const void *frameImageBuffer, int size); - QString _currentDeviceName, + QString _currentDeviceName, _newDeviceName; - QMap> _deviceProperties; + QMap> _deviceProperties; QMap> _deviceControls; - HRESULT _hr; - IMFSourceReader* _sourceReader; - SourceReaderCB* _sourceReaderCB; - EncoderThreadManager* _threadManager; - PixelFormat _pixelFormat, + HRESULT _hr; + IMFSourceReader* _sourceReader; + SourceReaderCB* _sourceReaderCB; + EncoderThreadManager* _threadManager; + PixelFormat _pixelFormat, _pixelFormatConfig; - int _lineLength, + int _lineLength, _frameByteSize, _noSignalCounterThreshold, _noSignalCounter, @@ -116,13 +116,13 @@ private: _contrast, _saturation, _hue; - QAtomicInt _currentFrame; - ColorRgb _noSignalThresholdColor; - bool _signalDetectionEnabled, - _noSignalDetected, + QAtomicInt _currentFrame; + ColorRgb _noSignalThresholdColor; + bool _signalDetectionEnabled, + _signalDetected, _initialized, _reload; - double _x_frac_min, + double _x_frac_min, _y_frac_min, _x_frac_max, _y_frac_max; diff --git a/include/grabber/video/v4l2/V4L2Grabber.h b/include/grabber/video/v4l2/V4L2Grabber.h index 75b375df..5ac00738 100644 --- a/include/grabber/video/v4l2/V4L2Grabber.h +++ b/include/grabber/video/v4l2/V4L2Grabber.h @@ -158,7 +158,7 @@ private: // signal detection int _noSignalCounterThreshold; ColorRgb _noSignalThresholdColor; - bool _standbyActivated, _signalDetectionEnabled, _noSignalDetected; + bool _standbyActivated, _signalDetectionEnabled, _signalDetected; int _noSignalCounter; int _brightness, _contrast, _saturation, _hue; double _x_frac_min; diff --git a/libsrc/grabber/video/mediafoundation/MFGrabber.cpp b/libsrc/grabber/video/mediafoundation/MFGrabber.cpp index 0a7e04a2..1cacf4aa 100644 --- a/libsrc/grabber/video/mediafoundation/MFGrabber.cpp +++ b/libsrc/grabber/video/mediafoundation/MFGrabber.cpp @@ -42,7 +42,7 @@ MFGrabber::MFGrabber() , _currentFrame(0) , _noSignalThresholdColor(ColorRgb{0,0,0}) , _signalDetectionEnabled(true) - , _noSignalDetected(true) + , _signalDetected(false) , _initialized(false) , _reload(false) , _x_frac_min(0.25) @@ -580,7 +580,7 @@ void MFGrabber::newThreadFrame(Image image) { if (_noSignalCounter >= _noSignalCounterThreshold) { - _noSignalDetected = false; + _signalDetected = true; Info(_log, "Signal detected"); } @@ -593,7 +593,7 @@ void MFGrabber::newThreadFrame(Image image) } else if (_noSignalCounter == _noSignalCounterThreshold) { - _noSignalDetected = true; + _signalDetected = false; Info(_log, "Signal lost"); } } diff --git a/libsrc/grabber/video/v4l2/V4L2Grabber.cpp b/libsrc/grabber/video/v4l2/V4L2Grabber.cpp index 8fbf552a..d4a73ab9 100644 --- a/libsrc/grabber/video/v4l2/V4L2Grabber.cpp +++ b/libsrc/grabber/video/v4l2/V4L2Grabber.cpp @@ -81,7 +81,7 @@ V4L2Grabber::V4L2Grabber() , _noSignalThresholdColor(ColorRgb{0,0,0}) , _standbyActivated(false) , _signalDetectionEnabled(true) - , _noSignalDetected(true) + , _signalDetected(false) , _noSignalCounter(0) , _brightness(0) , _contrast(0) @@ -1060,7 +1060,7 @@ void V4L2Grabber::newThreadFrame(Image image) { if (_noSignalCounter >= _noSignalCounterThreshold) { - _noSignalDetected = false; + _signalDetected = true; Info(_log, "Signal detected"); } @@ -1073,7 +1073,7 @@ void V4L2Grabber::newThreadFrame(Image image) } else if (_noSignalCounter == _noSignalCounterThreshold) { - _noSignalDetected = true; + _signalDetected = false; Info(_log, "Signal lost"); } }