From 2aecc862b885a3b05bbe3ba4ec161bceb4a81713 Mon Sep 17 00:00:00 2001
From: xzl <771730766@qq.com>
Date: Tue, 5 Sep 2017 15:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?=
 =?UTF-8?q?=E5=A2=9E=E9=87=8F=E7=BA=A0=E5=81=8F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MediaFile/Mp4Maker.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/MediaFile/Mp4Maker.cpp b/src/MediaFile/Mp4Maker.cpp
index 9937ba32..304d7eac 100644
--- a/src/MediaFile/Mp4Maker.cpp
+++ b/src/MediaFile/Mp4Maker.cpp
@@ -54,7 +54,12 @@ void Mp4Maker::inputH264(void *pData, uint32_t ui32Length, uint32_t ui32TimeStam
 	case 1: //P
 	case 5: { //IDR
 		if (m_strLastVideo.size()) {
-			_inputH264((char *) m_strLastVideo.data(), m_strLastVideo.size(), ui32TimeStamp - m_ui32LastVideoTime, m_iLastVideoType);
+			int64_t iTimeInc = (int64_t)ui32TimeStamp - (int64_t)m_ui32LastVideoTime;
+			iTimeInc = MAX(0,MIN(iTimeInc,500));
+			if(iTimeInc == 0 ||  iTimeInc == 500){
+				WarnL << "abnormal time stamp increment:" << ui32TimeStamp << " " << m_ui32LastVideoTime;
+			}
+			_inputH264((char *) m_strLastVideo.data(), m_strLastVideo.size(), iTimeInc, m_iLastVideoType);
 		}
 		//m_strLastVideo.assign(("\x0\x0\x0\x2\x9\xf0"), 6);
 		uint32_t *p = (uint32_t *) pData;
@@ -72,7 +77,12 @@ void Mp4Maker::inputH264(void *pData, uint32_t ui32Length, uint32_t ui32TimeStam
 }
 void Mp4Maker::inputAAC(void *pData, uint32_t ui32Length, uint32_t ui32TimeStamp){
 	if (m_strLastAudio.size()) {
-		_inputAAC((char *)m_strLastAudio.data(), m_strLastAudio.size(), ui32TimeStamp - m_ui32LastAudioTime);
+		int64_t iTimeInc = (int64_t)ui32TimeStamp - (int64_t)m_ui32LastAudioTime;
+		iTimeInc = MAX(0,MIN(iTimeInc,500));
+		if(iTimeInc == 0 ||  iTimeInc == 500){
+			WarnL << "abnormal time stamp increment:" << ui32TimeStamp << " " << m_ui32LastAudioTime;
+		}
+		_inputAAC((char *)m_strLastAudio.data(), m_strLastAudio.size(), iTimeInc);
 	}
 	m_strLastAudio.assign((char *)pData, ui32Length);
 	m_ui32LastAudioTime = ui32TimeStamp;