From 5fccf8f99164dc873803c23a199ada4bf7b71f59 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sat, 20 Jul 2024 15:12:27 +0800 Subject: [PATCH] Backup. --- application/MissionManager/src/MediaTask.cpp | 4 ++++ application/MissionManager/src/MediaTask.h | 2 ++ middleware/MediaManager/include/IMediaManager.h | 1 + middleware/MediaManager/src/IMediaManager.cpp | 5 +++++ middleware/MediaManager/src/RecordMp4.cpp | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/application/MissionManager/src/MediaTask.cpp b/application/MissionManager/src/MediaTask.cpp index c7257df..7194155 100644 --- a/application/MissionManager/src/MediaTask.cpp +++ b/application/MissionManager/src/MediaTask.cpp @@ -76,6 +76,10 @@ std::string MediaTask::GetThumbnailNameForSaving(const std::string &targetName) std::string unknowFile = "unknow"; return unknowFile; } +int MediaTask::GetVideoDuration_ms(void) +{ + return DEFAULT_VIDEO_DURATION_MS; +} void MediaTask::Response(const std::vector &response) { LogInfo("Response handle.\n"); diff --git a/application/MissionManager/src/MediaTask.h b/application/MissionManager/src/MediaTask.h index 2801aa2..a69c9c6 100644 --- a/application/MissionManager/src/MediaTask.h +++ b/application/MissionManager/src/MediaTask.h @@ -19,6 +19,7 @@ #include #include constexpr unsigned int MEDIA_TASK_TIMEOUT_MS = 1000 * 60; +constexpr int DEFAULT_VIDEO_DURATION_MS = 1000 * 10; typedef struct media_task_info { const std::vector mResponse; @@ -42,6 +43,7 @@ public: virtual unsigned int GetTaskTimeOutMs(void); std::string GetTargetNameForSaving(void) override; std::string GetThumbnailNameForSaving(const std::string &targetName) override; + int GetVideoDuration_ms(void) override; void Response(const std::vector &response) override; private: diff --git a/middleware/MediaManager/include/IMediaManager.h b/middleware/MediaManager/include/IMediaManager.h index aa58eb4..43951ec 100644 --- a/middleware/MediaManager/include/IMediaManager.h +++ b/middleware/MediaManager/include/IMediaManager.h @@ -59,6 +59,7 @@ public: virtual const MediaTaskType GetTaskType(void); virtual std::string GetTargetNameForSaving(void); virtual std::string GetThumbnailNameForSaving(const std::string &targetName); + virtual int GetVideoDuration_ms(void); virtual void Response(const std::vector &response); virtual bool IsTaskFinished(void); virtual const signed int GetIsNight(void); diff --git a/middleware/MediaManager/src/IMediaManager.cpp b/middleware/MediaManager/src/IMediaManager.cpp index 1324af3..75ceec1 100644 --- a/middleware/MediaManager/src/IMediaManager.cpp +++ b/middleware/MediaManager/src/IMediaManager.cpp @@ -40,6 +40,11 @@ std::string VMediaTask::GetThumbnailNameForSaving(const std::string &targetName) const std::string fileName = "Undefined"; return fileName; } +int VMediaTask::GetVideoDuration_ms(void) +{ + constexpr int DURATION_MS = 0; + return DURATION_MS; +} void VMediaTask::Response(const std::vector &response) { } diff --git a/middleware/MediaManager/src/RecordMp4.cpp b/middleware/MediaManager/src/RecordMp4.cpp index 49d695b..ccc31b2 100644 --- a/middleware/MediaManager/src/RecordMp4.cpp +++ b/middleware/MediaManager/src/RecordMp4.cpp @@ -39,7 +39,8 @@ StatusCode RecordMp4::Init(void) } std::string videoPath = mRecordTask->GetTargetNameForSaving(); std::string thumbnailPath = mRecordTask->GetThumbnailNameForSaving(videoPath); - OutputFileInfo fileInfo = {.mDuration_ms = 5000, .mFinished = &mIsRecordingFinished}; + const unsigned int duration_ms = mRecordTask->GetVideoDuration_ms(); + OutputFileInfo fileInfo = {.mDuration_ms = duration_ms, .mFinished = &mIsRecordingFinished}; if (OUTPUT_FILE_NAME_MAX >= videoPath.size()) { memcpy(fileInfo.mFileName, videoPath.c_str(), videoPath.size()); }