Transcoding: empty encoder buffer at the end of the process

Valentin Noel · Valentin Noel · commit 1480ad43c3ac · 2014-11-21T12:23:45.000+01:00
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -22,7 +22,7 @@ AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	, _inputStream   ( &inputStream )
 	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
+	, _selectedStream( inputStream.getStreamIndex() )
 {
 }
 
@@ -82,27 +82,30 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 	while( ! got_frame )
 	{
 		CodedData data;
-		if( ! _inputStream->readNextPacket( data ) )
-			return false;
 
 		AVPacket packet;
 		av_init_packet( &packet );
 
+		bool nextPacketRead = _inputStream->readNextPacket( data );
+
 		packet.stream_index = _selectedStream;
-		packet.data         = data.getPtr();
-		packet.size         = data.getSize();
-		
+		packet.data = nextPacketRead ? data.getPtr(): NULL;
+		packet.size = nextPacketRead ? data.getSize(): 0;
+
 		int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
 		
+		av_free_packet( &packet );
+
+		if( ! nextPacketRead && ret == 0 && got_frame == 0 )
+			return false;
+
 		if( ret < 0 )
 		{
 			char err[250];
 			av_strerror( ret, err, 250);
 			
 			throw std::runtime_error( "an error occured during video decoding - " + std::string(err) );
 		}
-		
-		av_free_packet( &packet );
 	}
 
 	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
