diff --git a/middleware/MediaManager/src/MediaHandle.cpp b/middleware/MediaManager/src/MediaHandle.cpp index 957896b..4105db5 100644 --- a/middleware/MediaManager/src/MediaHandle.cpp +++ b/middleware/MediaManager/src/MediaHandle.cpp @@ -192,6 +192,7 @@ void MediaHandle::FrameHandle(void) HandleListFrame(); } } + LogInfo("FrameHandle exit.\n"); } /** * @brief Processing audio and video streams may take a long time. This is not allowed to block the MediaHandle thread, @@ -217,7 +218,13 @@ void inline MediaHandle::HandleListFrame(void) leftFrameCount = mFrameList.size(); } while (leftFrameCount > 0); if (mStreamHandle->HandleFinished()) { + /** + * @brief A single media stream processing task is completed. The media stream processing thread and the media + * task waiting thread are released. + */ mTaskRuning = false; + mCvTaskHandle.notify_one(); + mCvFrameHandle.notify_one(); } } CameraTaskType MediaHandle::TaskTypeConvert(const MediaTaskType &type) diff --git a/utils/MediaBase/src/FfmpegThumbnail.cpp b/utils/MediaBase/src/FfmpegThumbnail.cpp index 502648c..a4f32cc 100644 --- a/utils/MediaBase/src/FfmpegThumbnail.cpp +++ b/utils/MediaBase/src/FfmpegThumbnail.cpp @@ -128,7 +128,7 @@ bool FfmpegThumbnail::CreateThumbnail(const std::string &outputFile, const void } void FfmpegThumbnail::GetDecodeDataCallback(AVFrame *frame) { - LogInfo("GetDecodeDataCallback frame->width = %d, frame->height=%d\n", frame->width, frame->height); + LogInfo("Decode frame->width = %d, frame->height=%d\n", frame->width, frame->height); AVFrame *thumbnailFrame = av_frame_alloc(); thumbnailFrame->format = AV_PIX_FMT_YUV420P; thumbnailFrame->width = mTargetWidth; @@ -162,7 +162,6 @@ void FfmpegThumbnail::GetDecodeDataCallback(AVFrame *frame) } void FfmpegThumbnail::GetEncodeDataCallback(AVPacket *pkt, const std::string &fileName) { - LogInfo("GetEncodeDataCallback, save thumbnail file %s\n", fileName.c_str()); SaveThumbnailFile(fileName, pkt->data, pkt->size); } bool FfmpegThumbnail::SaveThumbnailFile(const std::string &fileName, const void *data, const size_t &size)