JDierkse/CameraRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add RecorderMutex

Browse Source
This commit is contained in:
JDierkse
2023-03-16 13:41:53 +01:00
parent cacf6cfdca
commit 59f4409ab4
19 changed files with 233 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Recorder/FoscamRecorder.cpp
+34 -4
View File
@@ -13,7 +13,8 @@
namespace CameraRecorder {
namespace Recorder {
FoscamRecorder::FoscamRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
FoscamRecorder::FoscamRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
@@ -56,7 +57,12 @@ std::string FoscamRecorder::Snapshot(ctpl::thread_pool* pThreadPool, const std::
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
FoscamRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
//Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
//pThreadPool->push( [pHttpClient, settings, dateTimeString, pRecorderMutex](int) {
// pRecorderMutex->RegisterRecording(settings.IpAddress);
FoscamRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
// pRecorderMutex->UnregisterRecording(settings.IpAddress);
//} );
return fileName;
}
@@ -85,12 +91,24 @@ std::string FoscamRecorder::MultiSnapshot(ctpl::thread_pool* pThreadPool, const
return std::string();
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "FoscamRecorder MultiSnapshot Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "jpg", dateTimeString);
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
pThreadPool->push( [pHttpClient, settings, dateTimeString, numberOfImages](int) { FoscamRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages); } );
Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
pThreadPool->push( [pHttpClient, settings, dateTimeString, numberOfImages, pRecorderMutex](int) {
pRecorderMutex->RegisterRecording(settings.IpAddress);
FoscamRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages);
pRecorderMutex->UnregisterRecording(settings.IpAddress);
} );
return fileName;
}
@@ -124,6 +142,12 @@ std::string FoscamRecorder::Video(ctpl::thread_pool* pThreadPool, const std::str
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "FoscamRecorder Video Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "mp4", dateTimeString);
@@ -132,7 +156,13 @@ std::string FoscamRecorder::Video(ctpl::thread_pool* pThreadPool, const std::str
std::string cmd(command.str());
Logging::Log(Logging::Severity::Debug, cmd);
pThreadPool->push( [cmd](int) { int retval = std::system(cmd.c_str()); } );
Settings settings = m_settings;
Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
pThreadPool->push( [cmd, settings, pRecorderMutex](int) {
pRecorderMutex->RegisterRecording(settings.IpAddress);
int retval = std::system(cmd.c_str());
pRecorderMutex->UnregisterRecording(settings.IpAddress);
} );
return fileName;
}