From 2c9a659d4cb4b373cb7559afa3a4620269bc1acb Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sat, 15 Jun 2024 14:12:06 +0800 Subject: [PATCH] Fixed:media callback function bug. --- middleware/MediaManager/src/MediaHandle.cpp | 4 ++-- middleware/MediaManager/src/SaveStream.cpp | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/middleware/MediaManager/src/MediaHandle.cpp b/middleware/MediaManager/src/MediaHandle.cpp index a702839..21d3508 100644 --- a/middleware/MediaManager/src/MediaHandle.cpp +++ b/middleware/MediaManager/src/MediaHandle.cpp @@ -25,9 +25,9 @@ void MediaHandle::Init(void) LogError("CameraHal is null.\n"); return; } - auto audioFunc = std::bind(&MediaHandle::GetVideoStreamCallback, this, _1, _2, _3); + auto audioFunc = std::bind(&MediaHandle::GetAudioStreamCallback, this, _1, _2, _3); mCameraHal->SetAudioStreamCallback(audioFunc); - auto videoFunc = std::bind(&MediaHandle::GetAudioStreamCallback, this, _1, _2, _3); + auto videoFunc = std::bind(&MediaHandle::GetVideoStreamCallback, this, _1, _2, _3); mCameraHal->SetVideoStreamCallback(videoFunc); } void MediaHandle::UnInit(void) diff --git a/middleware/MediaManager/src/SaveStream.cpp b/middleware/MediaManager/src/SaveStream.cpp index bd8e158..8047f12 100644 --- a/middleware/MediaManager/src/SaveStream.cpp +++ b/middleware/MediaManager/src/SaveStream.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ #include "SaveStream.h" +#include "ILog.h" SaveStream::SaveStream() : mFileAudio(nullptr), mFileVideo(nullptr) { } @@ -35,14 +36,20 @@ void SaveStream::UnInit(void) void SaveStream::GetVideoStream(const void *stream, const int &length, const unsigned long long &timeStamp) { if (mFileVideo) { - fwrite(stream, 1, length, mFileVideo); + size_t writeLength = fwrite(stream, 1, length, mFileVideo); + if (writeLength != length) { + LogError("Write video stream failed.\n"); + } fflush(mFileVideo); } } void SaveStream::GetAudioStream(const void *stream, const int &length, const unsigned long long &timeStamp) { if (mFileAudio) { - fwrite(stream, 1, length, mFileAudio); + size_t writeLength = fwrite(stream, 1, length, mFileAudio); + if (writeLength != length) { + LogError("Write video stream failed.\n"); + } fflush(mFileAudio); } } \ No newline at end of file