fix memory leak

especially in swr conversion

Author: defisym

Extensions/FFMpeg/ToInstall/Files/Data/Runtime/Unicode/FFMpeg.mfx

@@ -1043,6 +1043,7 @@ class FFMpeg {
 #ifdef _DEBUG
 					auto err = GetErrorStr(response);
 #endif // _DEBUG
+					av_packet_unref(frames.pPacket);
 
 					break;
 				}
@@ -1069,6 +1070,8 @@ class FFMpeg {
 		this->bSeeking = false;
 		convert_frame(frames.pLastFrame, callBack);
 
+		av_packet_unref(frames.pPacket);
+
 		return response;
 	}
 
@@ -1100,13 +1103,15 @@ class FFMpeg {
 		bReadFinish = (response == AVERROR_EOF);
 
 		const bool bStop = videoQueue.readFinish() && audioQueue.readFinish();
-
 		if (bReadFinish && !bStop) {
 			videoQueue.stopBlock();
 			audioQueue.stopBlock();
 		}
 
-		if (response < 0) { return response; }
+		if (response < 0) {
+			av_packet_unref(pPacket);
+			return response;
+		}
 
 		do {
 			if (pPacket->stream_index == video_stream_index) {
@@ -1126,9 +1131,6 @@ class FFMpeg {
 	}
 
 	inline void convert_frame(AVFrame* pFrame, const frameDataCallBack& callBack) {
-		// data invalid, do not trigger callback, in case of get a black frame
-		if (!pFrame->data[0]) { return; }
-
 #ifdef HW_DECODE
 		if (bHWDecode) {
 			av_frame_unref(pSWFrame);
@@ -1140,11 +1142,15 @@ class FFMpeg {
 					throw FFMpegException(FFMpegException_HWDecodeFailed);
 				}
 
-				pFrame = pSWFrame;
+				av_frame_unref(pFrame);
+				av_frame_move_ref(pFrame, pSWFrame);
 			}
 		}
 #endif // HW_DECODE
 
+		// data invalid, do not trigger callback, in case of get a black frame
+		if (!pFrame->data[0]) { return; }
+
 		// Convert data to Bitmap data
 		// https://zhuanlan.zhihu.com/p/53305541
 
@@ -1172,29 +1178,29 @@ class FFMpeg {
 
 		sws_scale(swsContext, pFrame->data, pFrame->linesize, 0, pFrame->height, bgr_buffer, linesize);
 
-		//bgr_buffer[0] is the BGR raw data
+		//bgr_buffer[0] is the BGR raw data, aka p_global_bgr_buffer
 		callBack(bgr_buffer[0], linesize[0], pFrame->height);
+
+		av_frame_unref(pFrame);
 	}
 
 	inline int decode_frame(const frameDataCallBack& callBack) {
 		SyncState syncState;
 
 		do {
 			// calc delay
-			syncState = get_syncState();
-
-			//syncState = SyncState::SYNC_SYNC;
+			syncState = get_syncState();			
 
 			// decode
 			switch (syncState) {
 				// video is faster, wait
-			case FFMpeg::SyncState::SYNC_VIDEOFASTER:
+			case SyncState::SYNC_VIDEOFASTER:
 				return 0;
 				// decode new video frame
-			case FFMpeg::SyncState::SYNC_CLOCKFASTER:
-			case FFMpeg::SyncState::SYNC_SYNC:
+			case SyncState::SYNC_CLOCKFASTER:
+			case SyncState::SYNC_SYNC:
 				int response = fill_decode([&]() {
-					return  decode_videoFrame(pVLastFrame);
+					return decode_videoFrame(pVLastFrame);
 				});
 
 				if (response < 0) {
@@ -1226,6 +1232,7 @@ class FFMpeg {
 
 	// pFrame: frame to receive data
 	// pLastFrame: frame to ref latest updated pFrame
+	// This function will handle the av_packet_unref
 	inline int decode_frameCore(bool& bFinishState, bool& bSendEAgain,
 		const bool& bBlockState, PacketQueue& queue,
 		AVCodecContext* pCodecContext, AVPacket* pPacket, AVFrame* pFrame, AVFrame* pLastFrame,
@@ -1249,6 +1256,7 @@ class FFMpeg {
 		bSendEAgain = (response == AVERROR(EAGAIN));
 
 		if (response < 0 && !bSendEAgain && response != AVERROR_EOF) {
+			av_packet_unref(pPacket);
 			return response;
 		}
 
@@ -1258,9 +1266,7 @@ class FFMpeg {
 
 		// won't release if current packed didn't use
 		if (!bSendEAgain) {
-			if (pPacket && pPacket->data) {
-				av_packet_unref(pPacket);
-			}
+			av_packet_unref(pPacket);
 		}
 
 		if (bFinishState) {
@@ -1284,27 +1290,24 @@ class FFMpeg {
 			&FFMpeg::decode_apacket);
 	}
 
+	// This function will handle the av_frame_unref
+	// av_packet_unref is handled by caller
 	inline int decode_vpacket(AVCodecContext* pVCodecContext, const AVPacket* pVPacket,
 		AVFrame* pFrame, AVFrame* pLastFrame) {
 		// Return decoded output data (into a frame) from a decoder
 		// https://ffmpeg.org/doxygen/trunk/group__lavc__decoding.html#ga11e6542c4e66d3028668788a1a74217c
 		int response = avcodec_receive_frame(pVCodecContext, pFrame);
 
-#ifdef _DEBUG
-		auto err = GetErrorStr(response);
-#endif
-
 		if (response == AVERROR(EAGAIN) || response == AVERROR_EOF) {
+			av_frame_unref(pFrame);
 			return response;
 		}
 
 		if (response < 0) {
 			av_frame_unref(pFrame);
-
 			return response;
 		}
 
-		//videoPts = 0;
 		videoPts = static_cast<double>(pFrame->best_effort_timestamp);
 
 		if (pVPacket != nullptr) {
@@ -1339,23 +1342,26 @@ class FFMpeg {
 		}
 #endif
 
-		if (!bSeeking
-			|| (bSeeking && (videoClock >= seekingTargetPts))) {
+		// update laset frame by moving ref
+		if (!bSeeking || (bSeeking && (videoClock >= seekingTargetPts))) {
 			av_frame_unref(pLastFrame);
-			av_frame_ref(pLastFrame, pFrame);
+			av_frame_move_ref(pLastFrame, pFrame);
 		}
 
 		av_frame_unref(pFrame);
 
 		return response;
 	}
 
+	// This function will handle the av_frame_unref
+	// av_packet_unref is handled by caller
 	//https://github.com/brookicv/FFMPEG-study/blob/master/FFmpeg-playAudio.cpp
 	inline int decode_apacket(AVCodecContext* pACodecContext, const AVPacket* pAPacket,
 		AVFrame* pFrame, AVFrame* pLastFrame) {
 		int response = avcodec_receive_frame(pACodecContext, pFrame);
 
 		if (response == AVERROR(EAGAIN) || response == AVERROR_EOF) {
+			av_frame_unref(pFrame);
 			return response;
 		}
 
@@ -1364,10 +1370,18 @@ class FFMpeg {
 			return response;
 		}
 
+		// frame to process
+		auto pBaseFrame = pFrame;
+
+		// a while loop is wrapped in, `av_buffersink_get_frame` to get filtered frame
 #ifdef AUDIO_TEMPO
+		pBaseFrame = pAFilterFrame;
 		response = av_buffersrc_add_frame_flags(buffersrc_ctx, pFrame, AV_BUFFERSRC_FLAG_KEEP_REF);
 
-		if (response < 0) { return response; }
+		if (response < 0) {
+			av_frame_unref(pFrame);
+			return response;
+		}
 
 		while (true) {
 			response = av_buffersink_get_frame(buffersink_ctx, pAFilterFrame);
@@ -1376,8 +1390,8 @@ class FFMpeg {
 			}
 
 			if (response < 0) {
-				av_frame_unref(pFrame);
 				av_frame_unref(pAFilterFrame);
+				av_frame_unref(pFrame);
 			}
 #endif //  AUDIO_TEMPO
 
@@ -1390,12 +1404,6 @@ class FFMpeg {
 #endif
 			}
 
-#ifdef AUDIO_TEMPO
-			auto pBaseFrame = pAFilterFrame;
-#else
-			auto pBaseFrame = pFrame;
-#endif //  AUDIO_TEMPO
-
 			// update context to avoid crash
 			if (bUpdateSwr) {
 				init_SwrContext(&pBaseFrame->ch_layout,
@@ -1421,15 +1429,23 @@ class FFMpeg {
 			audioPts = audioClock;
 			audioClock += static_cast<double>(audioSize) / (static_cast<double>(pcm_bytes) * static_cast<double>(pACodecContext->sample_rate));
 
+#ifdef AUDIO_TEMPO
+  			av_frame_unref(pAFilterFrame);
+#endif //  AUDIO_TEMPO
+
+			av_frame_unref(pFrame);
+
 			return audioSize;
 
 #ifdef AUDIO_TEMPO
 		}
 
-		av_frame_unref(pAFrame);
+		av_frame_unref(pAFilterFrame);
+#endif //  AUDIO_TEMPO
+
+		av_frame_unref(pFrame);
 
 		return -1;
-#endif //  AUDIO_TEMPO
 	}
 
 	// ------------------------------------

Extensions/FFMpeg/ToInstall/Files/Extensions/Unicode/FFMpeg.mfx

@@ -265,26 +265,17 @@ class PacketQueue {
 	}
 
 	inline bool put(AVPacket* pPacket) {
-		//AVPacket pkt;
-
-		//if (av_packet_ref(&pkt, pPacket) < 0) {
-		//	return false;
-		//}
-
-		const AVPacket pkt = *pPacket;
-		*pPacket = *pEmptyPacket;
-
 #ifdef QUEUE_SPINLOCK
 		SDL_AtomicLock(&audioLock);
 #else
 		SDL_LockMutex(mutex);
 #endif
+		AVPacket pkt = *pEmptyPacket;
+		av_packet_move_ref(&pkt, pPacket);
 
 		queue.emplace(pkt);
-
 		dataSize += pkt.size;
-		//nb_packets++;
-
+		
 #ifdef QUEUE_SPINLOCK
 #else
 		SDL_CondSignal(cond);
@@ -317,16 +308,10 @@ class PacketQueue {
 			}
 
 			if (!queue.empty()) {
-				//if (av_packet_ref(pPacket, &queue.front()) < 0) {
-				//	ret = false;
-
-				//	break;
-				//}
-
-				*pPacket = queue.front();
+				av_packet_unref(pPacket);
+				av_packet_move_ref(pPacket, &queue.front());
 
 				queue.pop();
-				//nb_packets--;
 				dataSize -= pPacket->size;
 
 				ret = true;