Fix playback of RAW files (no container)

Rename m_currentPts to m_nextSamplePts to make it more descriptive. Fix case when a sample has a Pts, would not increment the timestamp for the next sample
sunminglang · Sep 18, 2017 · d08948c · d08948c
1 parent c2bcfe1
commit d08948c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/FFmpegInterop/Source/MediaSampleProvider.cpp b/FFmpegInterop/Source/MediaSampleProvider.cpp
@@ -32,7 +32,7 @@ MediaSampleProvider::MediaSampleProvider(
 	, m_pAvCodecCtx(avCodecCtx)
 	, m_streamIndex(AVERROR_STREAM_NOT_FOUND)
 	, m_startOffset(AV_NOPTS_VALUE)
-	, m_currentPts(0)
+	, m_nextFramePts(0)
 {
 	DebugMessage(L"MediaSampleProvider\n");
 }
@@ -41,7 +41,7 @@ HRESULT MediaSampleProvider::AllocateResources()
 {
 	DebugMessage(L"AllocateResources\n");
 	m_startOffset = AV_NOPTS_VALUE;
-	m_currentPts = 0;
+	m_nextFramePts = 0;
 	return S_OK;
 }
 
@@ -104,12 +104,14 @@ HRESULT MediaSampleProvider::DecodeAVPacket(DataWriter^ dataWriter, AVPacket *av
 		if (avPacket->pts != AV_NOPTS_VALUE)
 		{
 			framePts = avPacket->pts;
-			m_currentPts = framePts;
+			// Set the PTS for the next sample if it doesn't one.
+			m_nextFramePts = framePts + frameDuration;
 		}
 		else
 		{
-			framePts = m_currentPts;
-			m_currentPts += frameDuration;
+			framePts = m_nextFramePts;
+			// Set the PTS for the next sample if it doesn't one.
+			m_nextFramePts += frameDuration;
 		}
 	}
 	return S_OK;

diff --git a/FFmpegInterop/Source/MediaSampleProvider.h b/FFmpegInterop/Source/MediaSampleProvider.h
@@ -48,7 +48,7 @@ namespace FFmpegInterop
 		std::vector<AVPacket> m_packetQueue;
 		int m_streamIndex;
 		int64 m_startOffset;
-		int64 m_currentPts;
+		int64 m_nextFramePts;
 
 	internal:
 		// The FFmpeg context. Because they are complex types