Merge pull request #132 from valnoel/fix_frame_skipped_at_transcode

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit a078157ce0a5 · 2014-11-21T14:28:48.000+01:00
Transcoding: empty encoder buffer at the end of the process
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -22,7 +22,6 @@ AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	, _inputStream   ( &inputStream )
 	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
 {
 }
 
@@ -82,27 +81,30 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 	while( ! got_frame )
 	{
 		CodedData data;
-		if( ! _inputStream->readNextPacket( data ) )
-			return false;
 
 		AVPacket packet;
 		av_init_packet( &packet );
 
-		packet.stream_index = _selectedStream;
-		packet.data         = data.getPtr();
-		packet.size         = data.getSize();
-		
+		bool nextPacketRead = _inputStream->readNextPacket( data );
+
+		packet.stream_index = _inputStream->getStreamIndex();
+		packet.data = nextPacketRead ? data.getPtr(): NULL;
+		packet.size = data.getSize();
+
 		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 );
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -31,8 +31,6 @@ class AvExport AvInputVideo : public IInputEssence
 	AvInputStream*     _inputStream;
 	VideoCodec _codec;
 	AVFrame*           _frame;
-
-	int                _selectedStream;
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ class AvExport AvInputVideo : public IInputEssence`
`31`	`31`	`AvInputStream* _inputStream;`
`32`	`32`	`VideoCodec _codec;`
`33`	`33`	`AVFrame* _frame;`
`34`		`-`
`35`		`- int _selectedStream;`
`36`	`34`	`};`
`37`	`35`
`38`	`36`	`}`