Wrapping: fix packets writting when input/output packet size asymmetry (comparing streams durations)

Valentin Noel · Valentin Noel · commit df3ad6508def · 2014-11-21T17:47:23.000+01:00
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -20,6 +20,7 @@ OutputFile::OutputFile( const std::string& filename )
 	, _stream        ( NULL )
 	, _filename      ( filename )
 	, _packetCount   ( 0 )
+	, _previousProcessedStreamDuration( 0.0 )
 	, _verbose       ( false )
 {
 	if( ( _formatContext = avformat_alloc_context() ) == NULL )
@@ -179,6 +180,19 @@ IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const si
 
 	av_free_packet( &packet );
 
+	// get the current streams
+	AVStream* currentStream = _formatContext->streams[ streamId ];
+	// compute its duration
+	double currentStreamDuration = (double)currentStream->cur_dts * currentStream->time_base.num / currentStream->time_base.den;
+
+	if( currentStreamDuration < _previousProcessedStreamDuration )
+	{
+		// if the current stream is strictly shorter than the previous, wait for more data
+		return IOutputStream::eWrappingWaitingForData;
+	}
+
+	_previousProcessedStreamDuration = currentStreamDuration;
+	
 	_packetCount++;
 	_frameCount.at( streamId )++;
 	return IOutputStream::eWrappingSuccess;
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -123,6 +123,8 @@ class AvExport OutputFile
 	std::string      _filename;
 
 	size_t           _packetCount;
+	
+	double           _previousProcessedStreamDuration;
 
 	bool             _verbose;
 };
