OutputStream: rename _duration to _wrappedPacketsDuration

Clement Champetier · Clement Champetier · commit 0837fbda4d09 · 2015-10-05T10:19:50.000+02:00
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -12,7 +12,7 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 	, _outputFile( outputFile )
 	, _outputAVStream( outputFile.getFormatContext().getAVStream( streamIndex ) )
 	, _streamIndex( streamIndex )
-	, _duration( 0 )
+	, _wrappedPacketsDuration( 0 )
 {
 }
 
@@ -32,8 +32,8 @@ float OutputStream::getStreamDuration() const
 	if( ! outputPTS.val )
 	{
 		LOG_WARN( "PTS generation when outputting stream " << _streamIndex << " is not set." )
-		if( _duration )
-			return av_q2d( _outputAVStream.codec->time_base ) * _duration;
+		if( _wrappedPacketsDuration )
+			return av_q2d( _outputAVStream.codec->time_base ) * _wrappedPacketsDuration;
 	}
 
 #if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)
@@ -55,7 +55,7 @@ IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )
 	IOutputStream::EWrappingStatus status = _outputFile.wrap( data, _streamIndex );
 
 	// append duration of the packet to the stream
-	_duration += data.getAVPacket().duration;
+	_wrappedPacketsDuration += data.getAVPacket().duration;
 
 	return status;
 }
diff --git a/src/AvTranscoder/stream/OutputStream.hpp b/src/AvTranscoder/stream/OutputStream.hpp
@@ -32,7 +32,7 @@ class AvExport OutputStream : public IOutputStream
 	 * It corresponds to the addition of the duration of all packets wrapped by this stream.
 	 * @see getStreamDuration
 	 */
-	size_t _duration;
+	size_t _wrappedPacketsDuration;
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )`
`12`	`12`	`, _outputFile( outputFile )`
`13`	`13`	`, _outputAVStream( outputFile.getFormatContext().getAVStream( streamIndex ) )`
`14`	`14`	`, _streamIndex( streamIndex )`
`15`		`- , _duration( 0 )`
	`15`	`+ , _wrappedPacketsDuration( 0 )`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`@@ -32,8 +32,8 @@ float OutputStream::getStreamDuration() const`
`32`	`32`	`if( ! outputPTS.val )`
`33`	`33`	`{`
`34`	`34`	`LOG_WARN( "PTS generation when outputting stream " << _streamIndex << " is not set." )`
`35`		`- if( _duration )`
`36`		`- return av_q2d( _outputAVStream.codec->time_base ) * _duration;`
	`35`	`+ if( _wrappedPacketsDuration )`
	`36`	`+ return av_q2d( _outputAVStream.codec->time_base ) * _wrappedPacketsDuration;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)`
`@@ -55,7 +55,7 @@ IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )`
`55`	`55`	`IOutputStream::EWrappingStatus status = _outputFile.wrap( data, _streamIndex );`
`56`	`56`
`57`	`57`	`// append duration of the packet to the stream`
`58`		`- _duration += data.getAVPacket().duration;`
	`58`	`+ _wrappedPacketsDuration += data.getAVPacket().duration;`
`59`	`59`
`60`	`60`	`return status;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class AvExport OutputStream : public IOutputStream`
`32`	`32`	`* It corresponds to the addition of the duration of all packets wrapped by this stream.`
`33`	`33`	`* @see getStreamDuration`
`34`	`34`	`*/`
`35`		`- size_t _duration;`
	`35`	`+ size_t _wrappedPacketsDuration;`
`36`	`36`	`};`
`37`	`37`
`38`	`38`	`}`