From be81aa7fbb5f7c4acc5838373522d715fc055984 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 14 Nov 2018 14:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmp4=E7=82=B9=E6=92=AD?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MediaFile/MediaReader.cpp | 22 ++++++++++++----------
 src/MediaFile/MediaReader.h   |  6 +++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp
index 2e8ee66d..dc697c58 100644
--- a/src/MediaFile/MediaReader.cpp
+++ b/src/MediaFile/MediaReader.cpp
@@ -153,8 +153,10 @@ void MediaReader::startReadMP4() {
     GET_CONFIG_AND_REGISTER(uint32_t,sampleMS,Record::kSampleMS);
 
     AsyncTaskThread::Instance().DoTaskDelay(reinterpret_cast<uint64_t>(this), sampleMS, [strongSelf](){
-		return strongSelf->readSample();
+		return strongSelf->readSample(0,false);
 	});
+    //先读sampleMS毫秒的数据用于产生MediaSouce
+	readSample(sampleMS, false);
 	_mediaMuxer->setListener(strongSelf);
 }
  bool MediaReader::seekTo(uint32_t ui32Stamp){
@@ -166,11 +168,11 @@ bool MediaReader::close(){
     return true;
 }
 
-bool MediaReader::readSample(int iTimeInc) {
+bool MediaReader::readSample(int iTimeInc,bool justSeekSyncFrame) {
 	TimeTicker();
 	lock_guard<recursive_mutex> lck(_mtx);
-	auto bFlag0 = readVideoSample(iTimeInc);//数据没读完
-	auto bFlag1 = readAudioSample(iTimeInc);//数据没读完
+	auto bFlag0 = readVideoSample(iTimeInc,justSeekSyncFrame);//数据没读完
+	auto bFlag1 = readAudioSample(iTimeInc,justSeekSyncFrame);//数据没读完
 	auto bFlag2 = _mediaMuxer->readerCount() > 0;//读取者大于0
 	if((bFlag0 || bFlag1) && bFlag2){
 		_alive.resetTime();
@@ -179,15 +181,15 @@ bool MediaReader::readSample(int iTimeInc) {
 	//3秒延时关闭
 	return  _alive.elapsedTime() <  3 * 1000;
 }
-inline bool MediaReader::readVideoSample(int iTimeInc) {
+inline bool MediaReader::readVideoSample(int iTimeInc,bool justSeekSyncFrame) {
 	if (_video_trId != MP4_INVALID_TRACK_ID) {
 		auto iNextSample = getVideoSampleId(iTimeInc);
 		MP4SampleId iIdx = _video_current;
-		for (iIdx = _video_current; iIdx < iNextSample; iIdx++) {
+		for (; iIdx < iNextSample; iIdx++) {
 			uint8_t *pBytes = _pcVideoSample.get();
 			uint32_t numBytes = _video_sample_max_size;
 			if(MP4ReadSample(_hMP4File, _video_trId, iIdx + 1, &pBytes, &numBytes,NULL,NULL,NULL,&_bSyncSample)){
-				if (!iTimeInc) {
+				if (!justSeekSyncFrame) {
 					uint32_t iOffset = 0;
 					while (iOffset < numBytes) {
 						uint32_t iFrameLen;
@@ -213,14 +215,14 @@ inline bool MediaReader::readVideoSample(int iTimeInc) {
 	return false;
 }
 
-inline bool MediaReader::readAudioSample(int iTimeInc) {
+inline bool MediaReader::readAudioSample(int iTimeInc,bool justSeekSyncFrame) {
 	if (_audio_trId != MP4_INVALID_TRACK_ID) {
 		auto iNextSample = getAudioSampleId(iTimeInc);
 		for (auto i = _audio_current; i < iNextSample; i++) {
 			uint32_t numBytes = _audio_sample_max_size;
 			uint8_t *pBytes = _adts.buffer + 7;
 			if(MP4ReadSample(_hMP4File, _audio_trId, i + 1, &pBytes, &numBytes)){
-				if (!iTimeInc) {
+				if (!justSeekSyncFrame) {
 					_adts.aac_frame_length = 7 + numBytes;
 					writeAdtsHeader(_adts, _adts.buffer);
 					writeAAC(_adts.buffer, _adts.aac_frame_length, (double) _audio_ms * i / _audio_num_samples);
@@ -276,7 +278,7 @@ void MediaReader::seek(uint32_t iSeekTime,bool bReStart){
 	}else{
 		setSeekTime(iSeekTime - 5000);
 		//在之后的10秒查找关键帧
-		readVideoSample(10000);
+		readVideoSample(10000, true);
 		if (_bSyncSample) {
 			//找到关键帧
 			auto iIdr =  _video_current;
diff --git a/src/MediaFile/MediaReader.h b/src/MediaFile/MediaReader.h
index 40ed34a4..9ba36258 100644
--- a/src/MediaFile/MediaReader.h
+++ b/src/MediaFile/MediaReader.h
@@ -56,9 +56,9 @@ private:
 	void startReadMP4();
 	inline MP4SampleId getVideoSampleId(int iTimeInc = 0);
 	inline MP4SampleId getAudioSampleId(int iTimeInc = 0);
-	bool readSample(int iTimeInc = 0);
-	inline bool readVideoSample(int iTimeInc = 0);
-	inline bool readAudioSample(int iTimeInc = 0);
+	bool readSample(int iTimeInc, bool justSeekSyncFrame);
+	inline bool readVideoSample(int iTimeInc,bool justSeekSyncFrame);
+	inline bool readAudioSample(int iTimeInc,bool justSeekSyncFrame);
 	inline void writeH264(uint8_t *pucData,int iLen,uint32_t uiStamp);
 	inline void writeAAC(uint8_t *pucData,int iLen,uint32_t uiStamp);
 private: