InputFile: refactore readNextPacket

Clement Champetier · Clement Champetier · commit da3e09cd6af9 · 2014-12-05T11:34:50.000+01:00
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -147,9 +147,10 @@ AvInputStream& InputFile::getStream( size_t index )
 bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 {
 	AVPacket packet;
-	av_init_packet( &packet );
-	while( 1 )
+	bool nextPacketFound = false;
+	while( ! nextPacketFound )
 	{
+		av_init_packet( &packet );
 		int ret = av_read_frame( _formatContext, &packet );
 		if( ret < 0 ) // error or end of file
 		{
@@ -164,20 +165,16 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 			data.getBuffer().resize( packet.size );
 			if( packet.size != 0 )
 				memcpy( data.getPtr(), packet.data, packet.size );
-			av_free_packet( &packet );
-			return true;
+			nextPacketFound = true;
 		}
 		// else add the packet data to the stream cache
 		else
 		{
 			_inputStreams.at( packet.stream_index )->addPacket( packet );
 		}
-
-		// do not delete these 2 lines
-		// need to skip packet, delete this one and re-init for reading the next one
 		av_free_packet( &packet );
-		av_init_packet( &packet );
 	}
+	return true;
 }
 
 void InputFile::seekAtFrame( const size_t frame )

Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,10 @@ AvInputStream& InputFile::getStream( size_t index )`
`147`	`147`	`bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`148`	`148`	`{`
`149`	`149`	`AVPacket packet;`
`150`		`- av_init_packet( &packet );`
`151`		`- while( 1 )`
	`150`	`+ bool nextPacketFound = false;`
	`151`	`+ while( ! nextPacketFound )`
`152`	`152`	`{`
	`153`	`+ av_init_packet( &packet );`
`153`	`154`	`int ret = av_read_frame( _formatContext, &packet );`
`154`	`155`	`if( ret < 0 ) // error or end of file`
`155`	`156`	`{`
`@@ -164,20 +165,16 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`164`	`165`	`data.getBuffer().resize( packet.size );`
`165`	`166`	`if( packet.size != 0 )`
`166`	`167`	`memcpy( data.getPtr(), packet.data, packet.size );`
`167`		`- av_free_packet( &packet );`
`168`		`- return true;`
	`168`	`+ nextPacketFound = true;`
`169`	`169`	`}`
`170`	`170`	`// else add the packet data to the stream cache`
`171`	`171`	`else`
`172`	`172`	`{`
`173`	`173`	`_inputStreams.at( packet.stream_index )->addPacket( packet );`
`174`	`174`	`}`
`175`		`-`
`176`		`- // do not delete these 2 lines`
`177`		`- // need to skip packet, delete this one and re-init for reading the next one`
`178`	`175`	`av_free_packet( &packet );`
`179`		`- av_init_packet( &packet );`
`180`	`176`	`}`
	`177`	`+ return true;`
`181`	`178`	`}`
`182`	`179`
`183`	`180`	`void InputFile::seekAtFrame( const size_t frame )`