From 0e6ab49076555b3942cb31f67f32e494afd04811 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 23 Jul 2024 15:53:37 +0800 Subject: [PATCH] Fixed:thumbnail jpeg crash. --- utils/MediaBase/src/FfmpegOutputStream.cpp | 2 +- utils/MediaBase/src/FfmpegThumbnail.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/MediaBase/src/FfmpegOutputStream.cpp b/utils/MediaBase/src/FfmpegOutputStream.cpp index 06fd463..7b053c6 100644 --- a/utils/MediaBase/src/FfmpegOutputStream.cpp +++ b/utils/MediaBase/src/FfmpegOutputStream.cpp @@ -199,7 +199,7 @@ void FfmpegOutputStream::CreateThumbnailFile(const void *frame, const size_t &si void FfmpegOutputStream::CreateThumbnailFileThread(const void *frame, const size_t &size) { FfmpegThumbnail thumbnail(AV_CODEC_ID_MJPEG, AV_CODEC_ID_H264); - ThumbnailInfo info(1920, 2160, 640, 480); // TODO: + ThumbnailInfo info(1920, 2160, 192, 216); // TODO: thumbnail.Init(info); thumbnail.CreateThumbnail(mThumbnailFileName, frame, size); thumbnail.UnInit(); diff --git a/utils/MediaBase/src/FfmpegThumbnail.cpp b/utils/MediaBase/src/FfmpegThumbnail.cpp index 9a7bd1a..0f21f97 100644 --- a/utils/MediaBase/src/FfmpegThumbnail.cpp +++ b/utils/MediaBase/src/FfmpegThumbnail.cpp @@ -172,7 +172,6 @@ void FfmpegThumbnail::GetDecodeDataCallback(AVFrame *frame) // Perform pixel format conversion. sws_scale(mSwsCtx, frame->data, frame->linesize, 0, frame->height, thumbnailFrame->data, thumbnailFrame->linesize); - return; if (mEncoder) { mEncoder->EncodeData(thumbnailFrame, mStream, mEncodeCallback); }