AvInputVideo: use VideoCodec

cchampet · cchampet · commit a7b4158db6f4 · 2014-10-12T17:14:48.000+02:00
* Symmetry with AvOutputVideo:
    * use a VideoCodec.
    * no need to allocate and free AV codec objects ; it is done by our
ICodec class.
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -20,21 +20,14 @@ namespace avtranscoder
 AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
-	, _codec         ( NULL )
-	, _codecContext  ( NULL )
+	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
 	, _frame         ( NULL )
 	, _selectedStream( -1 )
 {
 }
 
 AvInputVideo::~AvInputVideo()
 {
-	if( _codecContext != NULL )
-	{
-		//avcodec_close( _codecContext );
-		av_free( _codecContext );
-		_codecContext = NULL;
-	}
 	if( _frame != NULL )
 	{
 #if LIBAVCODEC_VERSION_MAJOR > 54
@@ -52,33 +45,22 @@ AvInputVideo::~AvInputVideo()
 
 void AvInputVideo::setup()
 {
-	av_register_all();
-
-	_codec = avcodec_find_decoder( _inputStream->getVideoCodec().getCodecId() );
-	if( _codec == NULL )
-	{
-		throw std::runtime_error( "codec not supported" );
-	}
-
-	_codecContext = avcodec_alloc_context3( _codec );
-	if( _codecContext == NULL )
-	{
-		throw std::runtime_error( "unable to find context for codec" );
-	}
+	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
+	AVCodec* avCodec = _codec.getAVCodec();
 
-	// if( codec->capabilities & CODEC_CAP_TRUNCATED )
-	// 	codecContext->flags |= CODEC_FLAG_TRUNCATED;
+	// if( avCodec->capabilities & CODEC_CAP_TRUNCATED )
+	// 	avCodecContext->flags |= CODEC_FLAG_TRUNCATED;
 
-	int ret = avcodec_open2( _codecContext, _codec, NULL );
+	int ret = avcodec_open2( avCodecContext, avCodec, NULL );
 
-	if( ret < 0 || _codecContext == NULL || _codec == NULL )
+	if( ret < 0 || avCodecContext == NULL || avCodec == NULL )
 	{
 		std::string msg = "unable open video codec: ";
-		msg +=  _codec->long_name;
+		msg +=  avCodec->long_name;
 		msg += " (";
-		msg += _codec->name;
+		msg += avCodec->name;
 		msg += ")";
-		avcodec_close( _codecContext );
+		avcodec_close( avCodecContext );
 		throw std::runtime_error( msg );
 	}
 
@@ -110,7 +92,7 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 		packet.data         = data.getPtr();
 		packet.size         = data.getSize();
 		
-		int ret = avcodec_decode_video2( _codecContext, _frame, &got_frame, &packet );
+		int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
 		
 		if( ret < 0 )
 		{
@@ -142,12 +124,12 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 
 void AvInputVideo::flushDecoder()
 {
-	avcodec_flush_buffers( _codecContext );
+	avcodec_flush_buffers( _codec.getAVCodecContext() );
 }
 
 void AvInputVideo::setProfile( const Profile::ProfileDesc& desc )
 {
-	Context codecContext( _codecContext );
+	Context codecContext( _codec.getAVCodecContext() );
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -2,10 +2,9 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_VIDEO_HPP_
 
 #include "IInputEssence.hpp"
+#include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/Profile.hpp>
 
-struct AVCodec;
-struct AVCodecContext;
 struct AVFrame;
 
 namespace avtranscoder
@@ -30,8 +29,7 @@ class AvExport AvInputVideo : public IInputEssence
 	
 private:
 	AvInputStream*     _inputStream;
-	AVCodec*           _codec;
-	AVCodecContext*    _codecContext;
+	VideoCodec _codec;
 	AVFrame*           _frame;
 
 	int                _selectedStream;
