zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Move cleanupOldVideos to the VideoManager 

The receiver should not touch the old videos folder, it's not
the responsible class for that.
QGC4.4
Tomaz Canabrava 5 years ago
parent
5b517ec4e3
commit
63623b0f33
4 changed files with 58 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/VideoStreaming/VideoManager.cc
  2. 5
      src/VideoStreaming/VideoManager.h
  3. 71
      src/VideoStreaming/VideoReceiver.cc
  4. 14
      src/VideoStreaming/VideoReceiver.h

64
src/VideoStreaming/VideoManager.cc
Unescape View File

@ -89,11 +89,9 @@ VideoManager::setToolbox(QGCToolbox *toolbox) @@ -89,11 +89,9 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
for (auto *videoReceiver : { _videoReceiver, _thermalVideoReceiver}) {
// First, Setup the current values from the settings.
videoReceiver->setRtspTimeout(_videoSettings->rtspTimeout()->rawValue().toInt());
videoReceiver->setMaxVideoSize(_videoSettings->maxVideoSize()->rawValue().toInt());
videoReceiver->setStreamEnabled(_videoSettings->streamEnabled()->rawValue().toBool());
videoReceiver->setRecordingFormatId(_videoSettings->recordingFormat()->rawValue().toInt());
videoReceiver->setStreamConfigured(_videoSettings->streamConfigured());
videoReceiver->setStorageLimit(_videoSettings->enableStorageLimit()->rawValue().toBool());
connect(_videoSettings->rtspTimeout(), &Fact::rawValueChanged,
videoReceiver, [videoReceiver](const QVariant &value) {
@ -101,12 +99,6 @@ VideoManager::setToolbox(QGCToolbox *toolbox) @@ -101,12 +99,6 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
}
);
connect(_videoSettings->maxVideoSize(), &Fact::rawValueChanged,
videoReceiver, [videoReceiver](const QVariant &value) {
videoReceiver->setMaxVideoSize(value.toInt());
}
);
connect(_videoSettings->streamEnabled(), &Fact::rawValueChanged,
videoReceiver, [videoReceiver](const QVariant &value) {
videoReceiver->setStreamEnabled(value.toBool());
@ -119,12 +111,6 @@ VideoManager::setToolbox(QGCToolbox *toolbox) @@ -119,12 +111,6 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
}
);
connect(_videoSettings->enableStorageLimit(), &Fact::rawValueChanged,
videoReceiver, [videoReceiver](const QVariant &value) {
videoReceiver->setStorageLimit(value.toInt());
}
);
// Why some options are facts while others aren't?
connect(_videoSettings, &VideoSettings::streamConfiguredChanged, videoReceiver, &VideoReceiver::setStreamConfigured);
@ -135,6 +121,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) @@ -135,6 +121,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
// Connect the video receiver with the rest of the app.
connect(videoReceiver, &VideoReceiver::restartTimeout, this, &VideoManager::restartVideo);
connect(videoReceiver, &VideoReceiver::sendMessage, qgcApp(), &QGCApplication::showMessage);
connect(videoReceiver, &VideoReceiver::beforeRecording, this, &VideoManager::cleanupOldVideos);
}
_updateSettings();
@ -148,6 +135,55 @@ VideoManager::setToolbox(QGCToolbox *toolbox) @@ -148,6 +135,55 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
#endif
}
QStringList VideoManager::videoMuxes()
{
return {"matroskamux", "qtmux", "mp4mux"};
}
QStringList VideoManager::videoExtensions()
{
return {"mkv", "mov", "mp4"};
}
void VideoManager::cleanupOldVideos()
{
#if defined(QGC_GST_STREAMING)
//-- Only perform cleanup if storage limit is enabled
if(!_videoSettings->enableStorageLimit()->rawValue().toBool()) {
return;
}
QString savePath = qgcApp()->toolbox()->settingsManager()->appSettings()->videoSavePath();
QDir videoDir = QDir(savePath);
videoDir.setFilter(QDir::Files | QDir::Readable | QDir::NoSymLinks | QDir::Writable);
videoDir.setSorting(QDir::Time);
QStringList nameFilters;
for(const QString& extension : videoExtensions()) {
nameFilters << QString("*.") + extension;
}
videoDir.setNameFilters(nameFilters);
//-- get the list of videos stored
QFileInfoList vidList = videoDir.entryInfoList();
if(!vidList.isEmpty()) {
uint64_t total = 0;
//-- Settings are stored using MB
uint64_t maxSize = _videoSettings->maxVideoSize()->rawValue().toUInt() * 1024 * 1024;
//-- Compute total used storage
for(int i = 0; i < vidList.size(); i++) {
total += vidList[i].size();
}
//-- Remove old movies until max size is satisfied.
while(total >= maxSize && !vidList.isEmpty()) {
total -= vidList.last().size();
qCDebug(VideoReceiverLog) << "Removing old video file:" << vidList.last().filePath();
QFile file (vidList.last().filePath());
file.remove();
vidList.removeLast();
}
}
#endif
}
//-----------------------------------------------------------------------------
void
VideoManager::startVideo()

5
src/VideoStreaming/VideoManager.h
Unescape View File

@ -67,6 +67,9 @@ public: @@ -67,6 +67,9 @@ public:
virtual VideoReceiver* videoReceiver () { return _videoReceiver; }
virtual VideoReceiver* thermalVideoReceiver () { return _thermalVideoReceiver; }
QStringList videoExtensions();
QStringList videoMuxes();
#if defined(QGC_DISABLE_UVC)
virtual bool uvcEnabled () { return false; }
#else
@ -82,6 +85,8 @@ public: @@ -82,6 +85,8 @@ public:
Q_INVOKABLE void startVideo ();
Q_INVOKABLE void stopVideo ();
void cleanupOldVideos();
signals:
void hasVideoChanged ();
void isGStreamerChanged ();

71
src/VideoStreaming/VideoReceiver.cc
Unescape View File

@ -70,7 +70,6 @@ VideoReceiver::VideoReceiver(QObject* parent) @@ -70,7 +70,6 @@ VideoReceiver::VideoReceiver(QObject* parent)
, _showFullScreen(false)
, _streamEnabled(false)
, _streamConfigured(false)
, _storageLimit(false)
, _unittTestMode(false)
, _isTaisync(false)
{
@ -459,19 +458,6 @@ void VideoReceiver::setStreamConfigured(bool enabled) @@ -459,19 +458,6 @@ void VideoReceiver::setStreamConfigured(bool enabled)
}
}
bool VideoReceiver::storageLimit() const
{
return _storageLimit;
}
void VideoReceiver::setStorageLimit(bool enabled)
{
if (_storageLimit != enabled) {
_storageLimit = enabled;
emit storageLimitChanged();
}
}
bool VideoReceiver::isTaisync() const
{
return _isTaisync;
@ -511,19 +497,6 @@ void VideoReceiver::setImagePath(const QString& value) @@ -511,19 +497,6 @@ void VideoReceiver::setImagePath(const QString& value)
}
}
int VideoReceiver::maxVideoSize() const
{
return _maxVideoSize;
}
void VideoReceiver::setMaxVideoSize(int value)
{
if (_maxVideoSize != value) {
_maxVideoSize = value;
emit maxVideoSizeChanged();
}
}
int VideoReceiver::recordingFormatId() const
{
return _recordingFormatId;
@ -880,46 +853,6 @@ VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer data) @@ -880,46 +853,6 @@ VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer data)
//-----------------------------------------------------------------------------
#if defined(QGC_GST_STREAMING)
void
VideoReceiver::_cleanupOldVideos()
{
//-- Only perform cleanup if storage limit is enabled
if(_storageLimit) {
QString savePath = _videoPath;
QDir videoDir = QDir(savePath);
videoDir.setFilter(QDir::Files | QDir::Readable | QDir::NoSymLinks | QDir::Writable);
videoDir.setSorting(QDir::Time);
//-- All the movie extensions we support
QStringList nameFilters;
for(uint32_t i = 0; i < NUM_MUXES; i++) {
nameFilters << QString("*.") + QString(kVideoExtensions[i]);
}
videoDir.setNameFilters(nameFilters);
//-- get the list of videos stored
QFileInfoList vidList = videoDir.entryInfoList();
if(!vidList.isEmpty()) {
uint64_t total = 0;
//-- Settings are stored using MB
uint64_t maxSize = _maxVideoSize * 1024 * 1024;
//-- Compute total used storage
for(int i = 0; i < vidList.size(); i++) {
total += vidList[i].size();
}
//-- Remove old movies until max size is satisfied.
while(total >= maxSize && !vidList.isEmpty()) {
total -= vidList.last().size();
qCDebug(VideoReceiverLog) << "Removing old video file:" << vidList.last().filePath();
QFile file (vidList.last().filePath());
file.remove();
vidList.removeLast();
}
}
}
}
#endif
//-----------------------------------------------------------------------------
#if defined(QGC_GST_STREAMING)
void
VideoReceiver::setVideoSink(GstElement* videoSink)
{
if(_pipeline != nullptr) {
@ -1049,6 +982,7 @@ void @@ -1049,6 +982,7 @@ void
VideoReceiver::startRecording(const QString &videoFile)
{
#if defined(QGC_GST_STREAMING)
emit beforeRecording();
qCDebug(VideoReceiverLog) << "Starting recording";
// exit immediately if we are already recording
@ -1063,9 +997,6 @@ VideoReceiver::startRecording(const QString &videoFile) @@ -1063,9 +997,6 @@ VideoReceiver::startRecording(const QString &videoFile)
return;
}
//-- Disk usage maintenance
_cleanupOldVideos();
QString savePath = _videoPath;
if(savePath.isEmpty()) {
emit sendMessage(tr("Unabled to record video. Video save path must be specified in Settings."));

14
src/VideoStreaming/VideoReceiver.h
Unescape View File

@ -45,10 +45,8 @@ public: @@ -45,10 +45,8 @@ public:
Q_PROPERTY(bool showFullScreen READ showFullScreen WRITE setShowFullScreen NOTIFY showFullScreenChanged)
Q_PROPERTY(bool streamEnabled READ streamEnabled WRITE setStreamEnabled NOTIFY streamEnabledChanged)
Q_PROPERTY(bool streamConfigured READ streamConfigured WRITE setStreamConfigured NOTIFY streamConfiguredChanged)
Q_PROPERTY(bool storageLimit READ storageLimit WRITE setStorageLimit NOTIFY storageLimitChanged)
Q_PROPERTY(bool isTaisync READ isTaisync WRITE setIsTaysinc NOTIFY isTaisyncChanged)
Q_PROPERTY(int maxVideoSize READ maxVideoSize WRITE setMaxVideoSize NOTIFY maxVideoSizeChanged)
Q_PROPERTY(int recordingFormatId READ recordingFormatId WRITE setRecordingFormatId NOTIFY recordingFormatIdChanged)
Q_PROPERTY(int rtspTimeout READ rtspTimeout WRITE setRtspTimeout NOTIFY rtspTimeoutChanged)
@ -63,10 +61,6 @@ public: @@ -63,10 +61,6 @@ public:
Q_SLOT void setStreamConfigured(bool enabled);
Q_SIGNAL void streamConfiguredChanged();
bool storageLimit() const;
Q_SLOT void setStorageLimit(bool enabled);
Q_SIGNAL void storageLimitChanged();
bool isTaisync() const;
Q_SLOT void setIsTaysinc(bool value);
Q_SIGNAL void isTaisyncChanged();
@ -79,10 +73,6 @@ public: @@ -79,10 +73,6 @@ public:
Q_SLOT void setImagePath(const QString& path);
Q_SIGNAL void imagePathChanged();
int maxVideoSize() const;
Q_SLOT void setMaxVideoSize(int value);
Q_SIGNAL void maxVideoSizeChanged();
int recordingFormatId() const;
Q_SLOT void setRecordingFormatId(int value);
Q_SIGNAL void recordingFormatIdChanged();
@ -94,6 +84,8 @@ public: @@ -94,6 +84,8 @@ public:
Q_SIGNAL void restartTimeout();
Q_SIGNAL void sendMessage(const QString& message);
// Emitted before recording starts.
Q_SIGNAL void beforeRecording();
void setUnittestMode(bool runUnitTests);
#if defined(QGC_GST_STREAMING)
virtual bool recording () { return _recording; }
@ -172,7 +164,6 @@ protected: @@ -172,7 +164,6 @@ protected:
virtual void _unlinkRecordingBranch (GstPadProbeInfo* info);
virtual void _shutdownRecordingBranch();
virtual void _shutdownPipeline ();
virtual void _cleanupOldVideos ();
GstElement* _pipeline;
GstElement* _videoSink;
@ -201,7 +192,6 @@ protected: @@ -201,7 +192,6 @@ protected:
bool _storageLimit;
bool _unittTestMode;
bool _isTaisync;
int _maxVideoSize; // in mbs.
int _recordingFormatId; // 0 - 2, defined in VideoReceiver.cc / kVideoExtensions. TODO: use a better representation.
int _rtspTimeout;

Write Preview
Loading…
Cancel
Save