From 7e6b8d46050c8aa0e70ec81377b23004438d57ab Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sat, 15 Jun 2024 14:18:21 +0800 Subject: [PATCH] Improve:MediaManager module. --- hal/include/IHalCpp.h | 4 ++-- middleware/MediaManager/src/SaveStream.cpp | 4 ++-- middleware/MediaManager/src/SaveStream.h | 4 ++-- middleware/MediaManager/src/VStreamHandle.cpp | 4 ++-- middleware/MediaManager/src/VStreamHandle.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hal/include/IHalCpp.h b/hal/include/IHalCpp.h index 9f07636..344e294 100644 --- a/hal/include/IHalCpp.h +++ b/hal/include/IHalCpp.h @@ -124,8 +124,8 @@ typedef struct camera_task_param } CameraTaskParam; // using AudioStreamCallback = void (*)(const void *, const int, const unsigned long long); // using VideoStreamCallback = void (*)(const void *, const int, const unsigned long long); -using AudioStreamCallback = std::function; -using VideoStreamCallback = std::function; +using AudioStreamCallback = std::function; +using VideoStreamCallback = std::function; class VCameraHal { public: diff --git a/middleware/MediaManager/src/SaveStream.cpp b/middleware/MediaManager/src/SaveStream.cpp index 8047f12..987cf2e 100644 --- a/middleware/MediaManager/src/SaveStream.cpp +++ b/middleware/MediaManager/src/SaveStream.cpp @@ -33,7 +33,7 @@ void SaveStream::UnInit(void) mFileVideo = nullptr; } } -void SaveStream::GetVideoStream(const void *stream, const int &length, const unsigned long long &timeStamp) +void SaveStream::GetVideoStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) { if (mFileVideo) { size_t writeLength = fwrite(stream, 1, length, mFileVideo); @@ -43,7 +43,7 @@ void SaveStream::GetVideoStream(const void *stream, const int &length, const uns fflush(mFileVideo); } } -void SaveStream::GetAudioStream(const void *stream, const int &length, const unsigned long long &timeStamp) +void SaveStream::GetAudioStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) { if (mFileAudio) { size_t writeLength = fwrite(stream, 1, length, mFileAudio); diff --git a/middleware/MediaManager/src/SaveStream.h b/middleware/MediaManager/src/SaveStream.h index 9120282..7cf5ba2 100644 --- a/middleware/MediaManager/src/SaveStream.h +++ b/middleware/MediaManager/src/SaveStream.h @@ -23,8 +23,8 @@ public: virtual ~SaveStream() = default; void Init(void) override; void UnInit(void) override; - void GetVideoStream(const void *stream, const int &length, const unsigned long long &timeStamp) override; - void GetAudioStream(const void *stream, const int &length, const unsigned long long &timeStamp) override; + void GetVideoStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) override; + void GetAudioStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) override; private: FILE *mFileAudio; diff --git a/middleware/MediaManager/src/VStreamHandle.cpp b/middleware/MediaManager/src/VStreamHandle.cpp index 431fbe3..c34beca 100644 --- a/middleware/MediaManager/src/VStreamHandle.cpp +++ b/middleware/MediaManager/src/VStreamHandle.cpp @@ -19,9 +19,9 @@ void VStreamHandle::Init(void) void VStreamHandle::UnInit(void) { } -void VStreamHandle::GetVideoStream(const void *stream, const int &length, const unsigned long long &timeStamp) +void VStreamHandle::GetVideoStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) { } -void VStreamHandle::GetAudioStream(const void *stream, const int &length, const unsigned long long &timeStamp) +void VStreamHandle::GetAudioStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp) { } \ No newline at end of file diff --git a/middleware/MediaManager/src/VStreamHandle.h b/middleware/MediaManager/src/VStreamHandle.h index 047aa5c..d7e23d8 100644 --- a/middleware/MediaManager/src/VStreamHandle.h +++ b/middleware/MediaManager/src/VStreamHandle.h @@ -21,7 +21,7 @@ public: virtual ~VStreamHandle() = default; virtual void Init(void); virtual void UnInit(void); - virtual void GetVideoStream(const void *stream, const int &length, const unsigned long long &timeStamp); - virtual void GetAudioStream(const void *stream, const int &length, const unsigned long long &timeStamp); + virtual void GetVideoStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp); + virtual void GetAudioStream(const void *stream, const unsigned int &length, const unsigned long long &timeStamp); }; #endif \ No newline at end of file