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/DigooRecorder.cpp
+2 -1
View File
@@ -6,7 +6,8 @@
namespace CameraRecorder {
namespace Recorder {
DigooRecorder::DigooRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
DigooRecorder::DigooRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
Recorder/DigooRecorder.h
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Recorder {
class DigooRecorder : public virtual Recorder
{
public:
DigooRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
DigooRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~DigooRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;
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;
}
Recorder/FoscamRecorder.h
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Recorder {
class FoscamRecorder : public virtual Recorder
{
public:
FoscamRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
FoscamRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~FoscamRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;
Recorder/RTSPRecorder.cpp
+36 -4
View File
@@ -8,7 +8,8 @@
namespace CameraRecorder {
namespace Recorder {
RTSPRecorder::RTSPRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
RTSPRecorder::RTSPRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
@@ -43,12 +44,20 @@ std::string RTSPRecorder::Snapshot(ctpl::thread_pool* pThreadPool, const std::st
}
}
//if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
// return std::string();
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "jpg", dateTimeString, 0);
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
RTSPRecorder::Snapshots(ffmpeg, settings, dateTimeString, 1);
//Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
//pThreadPool->push( [ffmpeg, settings, dateTimeString, pRecorderMutex](int) {
// pRecorderMutex->RegisterRecording(settings.IpAddress);
RTSPRecorder::Snapshots(ffmpeg, settings, dateTimeString, 1);
// pRecorderMutex->UnregisterRecording(settings.IpAddress);
//} );
return fileName;
}
@@ -78,12 +87,23 @@ std::string RTSPRecorder::MultiSnapshot(ctpl::thread_pool* pThreadPool, const st
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "RTSPRecorder MultiSnapshot Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "jpg", dateTimeString, 0);
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
pThreadPool->push( [ffmpeg, settings, dateTimeString, numberOfImages](int) { RTSPRecorder::Snapshots(ffmpeg, settings, dateTimeString, numberOfImages); } );
Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
pThreadPool->push( [ffmpeg, settings, dateTimeString, numberOfImages, pRecorderMutex](int) {
pRecorderMutex->RegisterRecording(settings.IpAddress);
RTSPRecorder::Snapshots(ffmpeg, settings, dateTimeString, numberOfImages);
pRecorderMutex->UnregisterRecording(settings.IpAddress);
} );
return fileName;
}
@@ -116,6 +136,12 @@ std::string RTSPRecorder::Video(ctpl::thread_pool* pThreadPool, const std::strin
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "RTSPRecorder Video Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "mp4", dateTimeString, 0);
@@ -124,7 +150,13 @@ std::string RTSPRecorder::Video(ctpl::thread_pool* pThreadPool, const std::strin
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;
}
Recorder/RTSPRecorder.h
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Recorder {
class RTSPRecorder : public virtual Recorder
{
public:
RTSPRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
RTSPRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~RTSPRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;
Recorder/Recorder.cpp
+2 -1
View File
@@ -4,7 +4,8 @@
namespace CameraRecorder {
namespace Recorder {
Recorder::Recorder()
Recorder::Recorder(Util::RecorderMutexPointer pRecorderMutex) :
m_pRecorderMutex(pRecorderMutex)
{
}
Recorder/Recorder.h
+5 -1
View File
@@ -1,6 +1,7 @@
#ifndef RECORDER_RECORDER_H
#define RECORDER_RECORDER_H
#include "Util/RecorderMutex.h"
#include <ctpl_stl.h>
#include <string>
@@ -11,12 +12,15 @@ namespace Recorder {
class Recorder
{
public:
Recorder();
Recorder(Util::RecorderMutexPointer pRecorderMutex);
~Recorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) = 0;
virtual std::string MultiSnapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg, int numberOfImages) = 0;
virtual std::string Video(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) = 0;
protected:
Util::RecorderMutexPointer m_pRecorderMutex;
};
} // namespace Recorder
Recorder/VStarCamRecorder.cpp
+36 -4
View File
@@ -10,7 +10,8 @@
namespace CameraRecorder {
namespace Recorder {
VStarCamRecorder::VStarCamRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
VStarCamRecorder::VStarCamRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
@@ -45,12 +46,20 @@ std::string VStarCamRecorder::Snapshot(ctpl::thread_pool* pThreadPool, const std
}
}
//if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
// return std::string();
std::string dateTimeString = Util::GetDateTimeString(true);
std::string fileName = GetFileName(m_settings, "jpg", dateTimeString, 0);
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
VStarCamRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
//Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
//pThreadPool->push( [pHttpClient, settings, dateTimeString, pRecorderMutex](int) {
// pRecorderMutex->RegisterRecording(settings.IpAddress);
VStarCamRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
// pRecorderMutex->UnregisterRecording(settings.IpAddress);
//} );
return fileName;
}
@@ -80,12 +89,23 @@ std::string VStarCamRecorder::MultiSnapshot(ctpl::thread_pool* pThreadPool, cons
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "VStarCamRecorder MultiSnapshot Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString(true);
std::string fileName = GetFileName(m_settings, "jpg", dateTimeString, 0);
Http::HttpClient* pHttpClient = m_pHttpClient;
Settings settings = m_settings;
pThreadPool->push( [pHttpClient, settings, dateTimeString, numberOfImages](int) { VStarCamRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages); } );
Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
pThreadPool->push( [pHttpClient, settings, dateTimeString, numberOfImages, pRecorderMutex](int) {
pRecorderMutex->RegisterRecording(settings.IpAddress);
VStarCamRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages);
pRecorderMutex->UnregisterRecording(settings.IpAddress);
} );
return fileName;
}
@@ -119,6 +139,12 @@ std::string VStarCamRecorder::Video(ctpl::thread_pool* pThreadPool, const std::s
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "VStarCamRecorder Video Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString(true);
std::string fileName = GetFileName(m_settings, "mp4", dateTimeString, 0);
@@ -127,7 +153,13 @@ std::string VStarCamRecorder::Video(ctpl::thread_pool* pThreadPool, const std::s
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;
}
Recorder/VStarCamRecorder.h
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Recorder {
class VStarCamRecorder : public virtual Recorder
{
public:
VStarCamRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
VStarCamRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~VStarCamRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;
Recorder/WatchBotRecorder.cpp
+36 -4
View File
@@ -13,7 +13,8 @@
namespace CameraRecorder {
namespace Recorder {
WatchBotRecorder::WatchBotRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
WatchBotRecorder::WatchBotRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
@@ -48,12 +49,20 @@ std::string WatchBotRecorder::Snapshot(ctpl::thread_pool* pThreadPool, const std
}
}
//if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
// 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;
WatchBotRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
//Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
//pThreadPool->push( [pHttpClient, settings, dateTimeString, pRecorderMutex](int) {
// pRecorderMutex->RegisterRecording(settings.IpAddress);
WatchBotRecorder::Snapshots(pHttpClient, settings, dateTimeString, 1);
// pRecorderMutex->UnregisterRecording(settings.IpAddress);
//} );
return fileName;
}
@@ -83,12 +92,23 @@ std::string WatchBotRecorder::MultiSnapshot(ctpl::thread_pool* pThreadPool, cons
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "WatchBotRecorder 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) { WatchBotRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages); } );
Util::RecorderMutexPointer pRecorderMutex = m_pRecorderMutex;
pThreadPool->push( [pHttpClient, settings, dateTimeString, numberOfImages, pRecorderMutex](int) {
pRecorderMutex->RegisterRecording(settings.IpAddress);
WatchBotRecorder::Snapshots(pHttpClient, settings, dateTimeString, numberOfImages);
pRecorderMutex->UnregisterRecording(settings.IpAddress);
} );
return fileName;
}
@@ -121,6 +141,12 @@ std::string WatchBotRecorder::Video(ctpl::thread_pool* pThreadPool, const std::s
}
}
if (m_pRecorderMutex->IsRecording(m_settings.IpAddress))
{
Logging::Log(Logging::Severity::Debug, "WatchBotRecorder MultiSnapshot Cancelled, Recording in progress");
return std::string();
}
std::string dateTimeString = Util::GetDateTimeString();
std::string fileName = GetFileName(m_settings, "mp4", dateTimeString);
@@ -129,7 +155,13 @@ std::string WatchBotRecorder::Video(ctpl::thread_pool* pThreadPool, const std::s
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;
}
Recorder/WatchBotRecorder.h
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Recorder {
class WatchBotRecorder : public virtual Recorder
{
public:
WatchBotRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
WatchBotRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~WatchBotRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;
Recorder/ZModoRecorder.cpp
+2 -1
View File
@@ -6,7 +6,8 @@
namespace CameraRecorder {
namespace Recorder {
ZModoRecorder::ZModoRecorder(Http::HttpClient* pHttpClient, const Settings& settings) :
ZModoRecorder::ZModoRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex) :
Recorder(pRecorderMutex),
m_pHttpClient(pHttpClient),
m_settings(settings)
{
Recorder/ZModoRecorder.h
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Recorder {
class ZModoRecorder : public virtual Recorder
{
public:
ZModoRecorder(Http::HttpClient* pHttpClient, const Settings& settings);
ZModoRecorder(Http::HttpClient* pHttpClient, const Settings& settings, Util::RecorderMutexPointer pRecorderMutex);
~ZModoRecorder();
virtual std::string Snapshot(ctpl::thread_pool* pThreadPool, const std::string& ffmpeg) override;