clean: add const when it's possible

Clement Champetier · Clement Champetier · commit 630915d1da2b · 2015-09-30T12:35:58.000+02:00
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -56,7 +56,7 @@ void ICodec::openCodec()
 	if( ! _avCodecContext )
 		throw std::runtime_error( "unable to open a codec with no codec context" );
 
-	int ret = avcodec_open2( _avCodecContext, _avCodec, NULL );
+	const int ret = avcodec_open2( _avCodecContext, _avCodec, NULL );
 	if( ret < 0 )
 	{
 		std::string msg = "unable open codec: ";
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -60,15 +60,15 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 	bool nextPacketFound = false;
 	while( ! nextPacketFound )
 	{
-		int ret = av_read_frame( &_formatContext.getAVFormatContext(), &data.getAVPacket() );
+		const int ret = av_read_frame( &_formatContext.getAVFormatContext(), &data.getAVPacket() );
 		if( ret < 0 ) // error or end of file
 		{
 			return false;
 		}
 
 		// if the packet stream is the expected one
 		// return the packet data
-		int packetStreamIndex = data.getAVPacket().stream_index;
+		const int packetStreamIndex = data.getAVPacket().stream_index;
 		if( packetStreamIndex == (int)streamIndex )
 		{
 			nextPacketFound = true;
@@ -85,13 +85,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 
 bool InputFile::seekAtFrame( const size_t frame, const int flag )
 {
-	uint64_t position = frame / getFps() * AV_TIME_BASE;
+	const uint64_t position = frame / getFps() * AV_TIME_BASE;
 	return _formatContext.seek( position, flag );
 }
 
 bool InputFile::seekAtTime( const double time, const int flag )
 {
-	uint64_t position = time * AV_TIME_BASE;
+	const uint64_t position = time * AV_TIME_BASE;
 	return _formatContext.seek( position, flag );
 }
 
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -35,7 +35,7 @@ float OutputStream::getStreamDuration() const
 
 size_t OutputStream::getNbFrames() const
 {
-	AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
+	const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
 	return outputStream.nb_frames;
 }
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -326,7 +326,7 @@ bool StreamTranscoder::processFrame()
 	// Manage offset
 	if( _offset > 0 )
 	{
-		bool endOfOffset = _outputStream->getStreamDuration() >= _offset;
+		const bool endOfOffset = _outputStream->getStreamDuration() >= _offset;
 		if( endOfOffset )
 		{
 			LOG_INFO( "End of positive offset" )
@@ -349,7 +349,7 @@ bool StreamTranscoder::processFrame()
 	}
 	else if( _offset < 0 )
 	{
-		bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );
+		const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );
 		if( endOfStream )
 		{
 			LOG_INFO( "End of negative offset" )
@@ -392,8 +392,7 @@ bool StreamTranscoder::processRewrap()
 	}
 
 	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
-	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
-
+	const IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
 	switch( wrappingStatus )
 	{
 		case IOutputStream::eWrappingSuccess:
@@ -450,8 +449,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	}
 
 	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
-	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
-
+	const IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
 	switch( wrappingStatus )
 	{
 		case IOutputStream::eWrappingSuccess:
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -248,7 +248,7 @@ ProcessStat Transcoder::process( IProgress& progress )
 	bool frameProcessed = true;
 	while( frameProcessed )
 	{
-		double progressDuration = _outputFile.getStream( 0 ).getStreamDuration();
+		const double progressDuration = _outputFile.getStream( 0 ).getStreamDuration();
 
 		// check if JobStatusCancel
 		if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ void ICodec::openCodec()`
`56`	`56`	`if( ! _avCodecContext )`
`57`	`57`	`throw std::runtime_error( "unable to open a codec with no codec context" );`
`58`	`58`
`59`		`- int ret = avcodec_open2( _avCodecContext, _avCodec, NULL );`
	`59`	`+ const int ret = avcodec_open2( _avCodecContext, _avCodec, NULL );`
`60`	`60`	`if( ret < 0 )`
`61`	`61`	`{`
`62`	`62`	`std::string msg = "unable open codec: ";`
Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,15 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`60`	`60`	`bool nextPacketFound = false;`
`61`	`61`	`while( ! nextPacketFound )`
`62`	`62`	`{`
`63`		`- int ret = av_read_frame( &_formatContext.getAVFormatContext(), &data.getAVPacket() );`
	`63`	`+ const int ret = av_read_frame( &_formatContext.getAVFormatContext(), &data.getAVPacket() );`
`64`	`64`	`if( ret < 0 ) // error or end of file`
`65`	`65`	`{`
`66`	`66`	`return false;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// if the packet stream is the expected one`
`70`	`70`	`// return the packet data`
`71`		`- int packetStreamIndex = data.getAVPacket().stream_index;`
	`71`	`+ const int packetStreamIndex = data.getAVPacket().stream_index;`
`72`	`72`	`if( packetStreamIndex == (int)streamIndex )`
`73`	`73`	`{`
`74`	`74`	`nextPacketFound = true;`
`@@ -85,13 +85,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`85`	`85`
`86`	`86`	`bool InputFile::seekAtFrame( const size_t frame, const int flag )`
`87`	`87`	`{`
`88`		`- uint64_t position = frame / getFps() * AV_TIME_BASE;`
	`88`	`+ const uint64_t position = frame / getFps() * AV_TIME_BASE;`
`89`	`89`	`return _formatContext.seek( position, flag );`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`bool InputFile::seekAtTime( const double time, const int flag )`
`93`	`93`	`{`
`94`		`- uint64_t position = time * AV_TIME_BASE;`
	`94`	`+ const uint64_t position = time * AV_TIME_BASE;`
`95`	`95`	`return _formatContext.seek( position, flag );`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ float OutputStream::getStreamDuration() const`
`35`	`35`
`36`	`36`	`size_t OutputStream::getNbFrames() const`
`37`	`37`	`{`
`38`		`- AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );`
	`38`	`+ const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );`
`39`	`39`	`return outputStream.nb_frames;`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ bool StreamTranscoder::processFrame()`
`326`	`326`	`// Manage offset`
`327`	`327`	`if( _offset > 0 )`
`328`	`328`	`{`
`329`		`- bool endOfOffset = _outputStream->getStreamDuration() >= _offset;`
	`329`	`+ const bool endOfOffset = _outputStream->getStreamDuration() >= _offset;`
`330`	`330`	`if( endOfOffset )`
`331`	`331`	`{`
`332`	`332`	`LOG_INFO( "End of positive offset" )`
`@@ -349,7 +349,7 @@ bool StreamTranscoder::processFrame()`
`349`	`349`	`}`
`350`	`350`	`else if( _offset < 0 )`
`351`	`351`	`{`
`352`		`- bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );`
	`352`	`+ const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );`
`353`	`353`	`if( endOfStream )`
`354`	`354`	`{`
`355`	`355`	`LOG_INFO( "End of negative offset" )`
`@@ -392,8 +392,7 @@ bool StreamTranscoder::processRewrap()`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )`
`395`		`- IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );`
`396`		`-`
	`395`	`+ const IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );`
`397`	`396`	`switch( wrappingStatus )`
`398`	`397`	`{`
`399`	`398`	`case IOutputStream::eWrappingSuccess:`
`@@ -450,8 +449,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )`
`450`	`449`	`}`
`451`	`450`
`452`	`451`	`LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )`
`453`		`- IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );`
`454`		`-`
	`452`	`+ const IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );`
`455`	`453`	`switch( wrappingStatus )`
`456`	`454`	`{`
`457`	`455`	`case IOutputStream::eWrappingSuccess:`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ ProcessStat Transcoder::process( IProgress& progress )`
`248`	`248`	`bool frameProcessed = true;`
`249`	`249`	`while( frameProcessed )`
`250`	`250`	`{`
`251`		`- double progressDuration = _outputFile.getStream( 0 ).getStreamDuration();`
	`251`	`+ const double progressDuration = _outputFile.getStream( 0 ).getStreamDuration();`
`252`	`252`
`253`	`253`	`// check if JobStatusCancel`
`254`	`254`	`if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )`