Fixed bug when creating motion video

Would accidentally trigger stream processor writing as well.
dac1976 · Feb 24, 2018 · 0092b76 · 0092b76
1 parent 1c894b1
commit 0092b76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/Source/IpFreelyMainWindow.cpp b/Source/IpFreelyMainWindow.cpp
@@ -547,7 +547,7 @@ void IpFreelyMainWindow::on_updateFeedsTimer()
             auto currentVideoFrame = streamProcessor.second->CurrentVideoFrame(&motionBoundingRect);
 
             auto fps         = streamProcessor.second->CurrentFps();
-            auto isRecording = streamProcessor.second->GetEnableVideoWriting();
+            auto isRecording = streamProcessor.second->EnableVideoWriting();
 
             UpdateCamFeedFrame(
                 streamProcessor.first, currentVideoFrame, motionBoundingRect, isRecording);
@@ -1207,7 +1207,7 @@ void IpFreelyMainWindow::RecordActionHandler(ipfreely::eCamId const camId, QTool
         return;
     }
 
-    if (streamProcIter->second->GetEnableVideoWriting())
+    if (streamProcIter->second->EnableVideoWriting())
     {
         streamProcIter->second->StopVideoWriting();
 

diff --git a/Source/IpFreelyStreamProcessor.cpp b/Source/IpFreelyStreamProcessor.cpp
@@ -146,10 +146,9 @@ IpFreelyStreamProcessor::IpFreelyStreamProcessor(
 
     m_updatePeriodMillisecs = static_cast<unsigned int>(1000.0 / m_fps);
 
-    DEBUG_MESSAGE_EX_INFO("Stream at: " << m_cameraDetails.streamUrl << " running with FPS of: "
-                                        << m_fps
-                                        << ", thread update period (ms): "
-                                        << m_updatePeriodMillisecs);
+    DEBUG_MESSAGE_EX_INFO("Stream at: "
+                          << m_cameraDetails.streamUrl << " running with FPS of: " << m_fps
+                          << ", thread update period (ms): " << m_updatePeriodMillisecs);
 
     m_eventThread = std::make_shared<core_lib::threads::EventThread>(
         std::bind(&IpFreelyStreamProcessor::ThreadEventCallback, this), m_updatePeriodMillisecs);
@@ -184,14 +183,9 @@ void IpFreelyStreamProcessor::StopVideoWriting() noexcept
     SetEnableVideoWriting(false);
 }
 
-bool IpFreelyStreamProcessor::GetEnableVideoWriting() const noexcept
+bool IpFreelyStreamProcessor::EnableVideoWriting() const noexcept
 {
-    bool isWriting = false;
-
-    {
-        std::lock_guard<std::mutex> lock(m_writingMutex);
-        isWriting = m_enableVideoWriting;
-    }
+    bool isWriting = GetEnableVideoWriting();
 
     if (!isWriting && m_motionDetector)
     {
@@ -328,6 +322,12 @@ void IpFreelyStreamProcessor::SetEnableVideoWriting(bool enable) noexcept
     m_enableVideoWriting = enable;
 }
 
+bool IpFreelyStreamProcessor::GetEnableVideoWriting() const noexcept
+{
+    std::lock_guard<std::mutex> lock(m_writingMutex);
+    return m_enableVideoWriting;
+}
+
 void IpFreelyStreamProcessor::CheckRecordingSchedule()
 {
     if (m_recordingSchedule.empty())

diff --git a/Source/IpFreelyStreamProcessor.h b/Source/IpFreelyStreamProcessor.h
@@ -89,10 +89,10 @@ class IpFreelyStreamProcessor final
     void StopVideoWriting() noexcept;
 
     /*!
-     * \brief GetEnableVideoWriting reports if stream is being written to disk.
+     * \brief EnableVideoWriting reports if stream is being written to disk.
      * \return True if writing, false otherwise.
      */
-    bool GetEnableVideoWriting() const noexcept;
+    bool EnableVideoWriting() const noexcept;
 
     /*!c
      * \brief VideoFrameUpdated monitors stream activity.
@@ -127,6 +127,7 @@ class IpFreelyStreamProcessor final
                                std::vector<std::vector<bool>> const& schedule);
     void        ThreadEventCallback() noexcept;
     void        SetEnableVideoWriting(bool enable) noexcept;
+    bool        GetEnableVideoWriting() const noexcept;
     void        CheckRecordingSchedule();
     void        CreateCaptureObjects();
     void        GrabVideoFrame();