AvInputVideo: refactore readNextFrame

Clement Champetier · Clement Champetier · commit 41e4cec54501 · 2014-11-03T12:17:01.000+01:00
Symmetry with AvInputAudio: add private function decodeNextFrame.
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -77,12 +77,36 @@ void AvInputVideo::setup()
 
 bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 {
-	int got_frame = 0;
+	if( ! decodeNextFrame() )
+		return false;
+
+	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
+
+	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
+	if( ! decodedSize )
+		return false;
+
+	if( imageBuffer.getBuffer().size() != decodedSize )
+		imageBuffer.getBuffer().resize( decodedSize );
+
+	// Copy pixel data from an AVPicture into one contiguous buffer.
+	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
+
+	return true;
+}
+
+bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+{
+	return false;
+}
 
+bool AvInputVideo::decodeNextFrame()
+{
+	int got_frame = 0;
 	while( ! got_frame )
 	{
 		CodedData data;
-		if( ! _inputStream->readNextPacket( data ) )
+		if( ! _inputStream->readNextPacket( data ) ) // error or end of file
 			return false;
 
 		AVPacket packet;
@@ -104,27 +128,9 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 		
 		av_free_packet( &packet );
 	}
-
-	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
-
-	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
-	if( ! decodedSize )
-		return false;
-
-	if( imageBuffer.getBuffer().size() != decodedSize )
-		imageBuffer.getBuffer().resize( decodedSize );
-
-	// Copy pixel data from an AVPicture into one contiguous buffer.
-	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
-
 	return true;
 }
 
-bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
-{
-	return false;
-}
-
 void AvInputVideo::flushDecoder()
 {
 	avcodec_flush_buffers( _codec->getAVCodecContext() );
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -28,6 +28,7 @@ class AvExport AvInputVideo : public IInputEssence
 	void setProfile( const Profile::ProfileDesc& desc );
 	
 private:
+	bool decodeNextFrame();
 
 	AvInputStream* _inputStream;  ///< Stream from which we read next frames
 	const VideoCodec* _codec;  ///< Video decoder. Has link (no ownership)
