clean into AvInputVideo: remove selected stream attribute and set packet size directly from frame size

Valentin Noel · Valentin Noel · commit d2f3d40c3f28 · 2014-11-21T13:59:15.000+01:00
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( inputStream.getStreamIndex() )
 {
 }
 
@@ -88,9 +87,9 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 
 		bool nextPacketRead = _inputStream->readNextPacket( data );
 
-		packet.stream_index = _selectedStream;
+		packet.stream_index = _inputStream->getStreamIndex();
 		packet.data = nextPacketRead ? data.getPtr(): NULL;
-		packet.size = nextPacketRead ? data.getSize(): 0;
+		packet.size = data.getSize();
 
 		int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
 		
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
`@@ -22,7 +22,6 @@ AvInputVideo::AvInputVideo( AvInputStream& inputStream )`
`22`	`22`	`, _inputStream ( &inputStream )`
`23`	`23`	`, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )`
`24`	`24`	`, _frame ( NULL )`
`25`		`- , _selectedStream( inputStream.getStreamIndex() )`
`26`	`25`	`{`
`27`	`26`	`}`
`28`	`27`
`@@ -88,9 +87,9 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )`
`88`	`87`
`89`	`88`	`bool nextPacketRead = _inputStream->readNextPacket( data );`
`90`	`89`
`91`		`- packet.stream_index = _selectedStream;`
	`90`	`+ packet.stream_index = _inputStream->getStreamIndex();`
`92`	`91`	`packet.data = nextPacketRead ? data.getPtr(): NULL;`
`93`		`- packet.size = nextPacketRead ? data.getSize(): 0;`
	`92`	`+ packet.size = data.getSize();`
`94`	`93`
`95`	`94`	`int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );`
`96`	`95`
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`	`}`