Merge branch 'develop' of https://github.com/mikrosimage/avTranscoder into dev_preloadCodecsAndFormats

Clement Champetier · Clement Champetier · commit 5481a5bd1f22 · 2015-01-13T16:31:31.000+01:00
Conflicts:
	src/AvTranscoder/encoder/AudioEncoder.cpp
	src/AvTranscoder/encoder/VideoEncoder.cpp
diff --git a/ressource/v_h264.prf b/ressource/v_h264.prf
@@ -0,0 +1,6 @@
+avProfileName=h264
+avProfileLongName=h264 High
+avProfileType=avProfileTypeVideo
+codec=h264
+profile=High
+r=25
diff --git a/ressource/v_x264.prf b/ressource/v_x264.prf
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -15,8 +15,8 @@ AudioCodec::AudioCodec( const ECodecType type, const AVCodecID codecId )
 {
 }
 
-AudioCodec::AudioCodec( const ICodec& codec )
-	: ICodec( codec )
+AudioCodec::AudioCodec( const ECodecType type, AVCodecContext& avCodecContext )
+	: ICodec( type, avCodecContext )
 {
 }
 
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -12,7 +12,7 @@ class AvExport AudioCodec : public ICodec
 public:
 	AudioCodec( const ECodecType type, const std::string& codecName = "" );
 	AudioCodec( const ECodecType type, const AVCodecID codecId );
-	AudioCodec( const ICodec& codec );
+	AudioCodec( const ECodecType type, AVCodecContext& avCodecContext );
 
 	AudioFrameDesc getAudioFrameDesc() const;
 
diff --git a/src/AvTranscoder/codec/DataCodec.cpp b/src/AvTranscoder/codec/DataCodec.cpp
@@ -13,8 +13,8 @@ DataCodec::DataCodec( const ECodecType type, const AVCodecID codecId )
 {
 }
 
-DataCodec::DataCodec( const ICodec& codec )
-	: ICodec( codec )
+DataCodec::DataCodec( const ECodecType type, AVCodecContext& avCodecContext )
+	: ICodec( type, avCodecContext )
 {
 }
 
diff --git a/src/AvTranscoder/codec/DataCodec.hpp b/src/AvTranscoder/codec/DataCodec.hpp
@@ -11,7 +11,7 @@ class AvExport DataCodec : public ICodec
 public:
 	DataCodec( const ECodecType type, const std::string& codecName = "" );
 	DataCodec( const ECodecType type, const AVCodecID codecId );
-	DataCodec( const ICodec& codec );
+	DataCodec( const ECodecType type, AVCodecContext& avCodecContext );
 };
 
 }
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -13,6 +13,7 @@ namespace avtranscoder {
 ICodec::ICodec( const ECodecType type, const std::string& codecName )
 	: _avCodecContext( NULL )
 	, _avCodec( NULL )
+	, _isCodecContextAllocated( true )
 	, _type( type )
 {
 	setCodec( type, codecName );
@@ -23,20 +24,58 @@ ICodec::ICodec( const ECodecType type, const std::string& codecName )
 ICodec::ICodec( const ECodecType type, const AVCodecID codecId )
 	: _avCodecContext( NULL )
 	, _avCodec( NULL )
+	, _isCodecContextAllocated( true )
 	, _type( type )
 {
 	setCodec( type, codecId );
 	allocateContext();
 	loadCodecOptions();
 }
 
+ICodec::ICodec( const ECodecType type, AVCodecContext& avCodecContext )
+	: _avCodecContext( &avCodecContext )
+	, _avCodec( NULL )
+	, _isCodecContextAllocated( false )
+	, _type( type )
+{
+	avcodec_register_all();  // TODO: call only once
+
+	setCodec( type, _avCodecContext->codec_id );
+}
+
 ICodec::~ICodec()
 {
+	if( ! _isCodecContextAllocated )
+		return;
+
 	avcodec_close( _avCodecContext );
 	av_free( _avCodecContext );
 	_avCodecContext = NULL;
 }
 
+void ICodec::open()
+{
+	if( ! _avCodecContext )
+		throw std::runtime_error( "unable to open a codec with no codec context" );
+
+	int ret = avcodec_open2( _avCodecContext, _avCodec, NULL );
+	if( ret < 0 )
+	{
+		std::string msg = "unable open codec: ";
+		msg +=  _avCodec->long_name;
+		msg += " (";
+		msg += _avCodec->name;
+		msg += ") ";
+		avcodec_close( _avCodecContext );
+
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( ret, err, sizeof(err) );
+		msg += err;
+
+		throw std::runtime_error( msg );
+	}
+}
+
 std::string ICodec::getCodecName() const
 {
 	assert( _avCodec != NULL );
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -23,9 +23,13 @@ class AvExport ICodec
 public:
 	ICodec( const ECodecType type, const std::string& codecName );
 	ICodec( const ECodecType type, const AVCodecID codecId );
+	ICodec( const ECodecType type, AVCodecContext& avCodecContext );
 
 	virtual ~ICodec() = 0;
 
+	/// Initialize the codec context.
+	void open();
+
 	std::string getCodecName() const;
 	AVCodecID getCodecId() const;
 	ECodecType getCodecType() const { return _type; }
@@ -52,6 +56,7 @@ class AvExport ICodec
 protected:
 	AVCodecContext* _avCodecContext; ///< Full codec instance description (has ownership)
 	AVCodec* _avCodec; ///< Codec abstract description
+	const bool _isCodecContextAllocated;  ///< Is the AVCodecContext allocated by the class
 
 	ECodecType _type;
 
diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -15,8 +15,8 @@ VideoCodec::VideoCodec( const ECodecType type, const AVCodecID codecId )
 {
 }
 
-VideoCodec::VideoCodec( const ICodec& codec )
-	: ICodec( codec )
+VideoCodec::VideoCodec( const ECodecType type, AVCodecContext& avCodecContext )
+	: ICodec( type, avCodecContext )
 {
 }
 
diff --git a/src/AvTranscoder/codec/VideoCodec.hpp b/src/AvTranscoder/codec/VideoCodec.hpp
@@ -14,7 +14,7 @@ class AvExport VideoCodec : public ICodec
 public:
 	VideoCodec( const ECodecType type, const std::string& codecName = "" );
 	VideoCodec( const ECodecType type, const AVCodecID codecId );
-	VideoCodec( const ICodec& codec );
+	VideoCodec( const ECodecType type, AVCodecContext& avCodecContext );
 	
 	VideoFrameDesc getVideoFrameDesc() const;
 	std::pair< size_t, size_t > getTimeBase() const;
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -44,28 +44,7 @@ AudioDecoder::~AudioDecoder()
 
 void AudioDecoder::setup()
 {
-	AVCodecContext& avCodecContext = _inputStream->getAudioCodec().getAVCodecContext();
-	AVCodec& avCodec = _inputStream->getAudioCodec().getAVCodec();
-
-	avCodecContext.channels = _inputStream->getAudioCodec().getAudioFrameDesc().getChannels();
-	
-	int ret = avcodec_open2( &avCodecContext, &avCodec, NULL );
-
-	if( ret < 0 || &avCodecContext == NULL || &avCodec == NULL )
-	{
-		std::string msg = "unable open audio codec: ";
-		msg +=  avCodec.long_name;
-		msg += " (";
-		msg += avCodec.name;
-		msg += ") ";
-		avcodec_close( &avCodecContext );
-
-		char err[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror( ret, err, sizeof(err) );
-		msg += err;
-
-		throw std::runtime_error( msg );
-	}
+	_inputStream->getAudioCodec().open();
 
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	_frame = av_frame_alloc();
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -42,24 +42,8 @@ VideoDecoder::~VideoDecoder()
 
 void VideoDecoder::setup()
 {
-	AVCodecContext& avCodecContext = _inputStream->getVideoCodec().getAVCodecContext();
-	AVCodec& avCodec = _inputStream->getVideoCodec().getAVCodec();
-
-	// if( avCodec->capabilities & CODEC_CAP_TRUNCATED )
-	// 	avCodecContext->flags |= CODEC_FLAG_TRUNCATED;
-
-	int ret = avcodec_open2( &avCodecContext, &avCodec, NULL );
-
-	if( ret < 0 || &avCodecContext == NULL || &avCodec == NULL )
-	{
-		std::string msg = "unable open video codec: ";
-		msg +=  avCodec.long_name;
-		msg += " (";
-		msg += avCodec.name;
-		msg += ")";
-		avcodec_close( &avCodecContext );
-		throw std::runtime_error( msg );
-	}
+	
+	_inputStream->getVideoCodec().open();
 
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	_frame = av_frame_alloc();
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -19,19 +19,7 @@ AudioEncoder::AudioEncoder( const std::string& audioCodecName )
 
 void AudioEncoder::setup()
 {
-	AVCodecContext& avCodecContext = _codec.getAVCodecContext();
-	const AVCodec& avCodec = _codec.getAVCodec();
-
-	// try to open encoder with parameters.
-	int ret = avcodec_open2( &avCodecContext, &avCodec, NULL );
-	if( ret < 0 )
-	{
-		char err[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror( ret, err, sizeof(err) );
-		std::string msg = "could not open audio encoder " + _codec.getCodecName() +": ";
-		msg += err;
-		throw std::runtime_error( msg );
-	}
+	_codec.open();
 }
 
 bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -20,23 +20,7 @@ VideoEncoder::VideoEncoder( const std::string& videoCodecName )
 
 void VideoEncoder::setup()
 {
-	AVCodecContext& avCodecContext( _codec.getAVCodecContext() );
-
-	if( &avCodecContext == NULL )
-	{
-		throw std::runtime_error( "could not allocate video codec context" );
-	}
-
-	// try to open encoder with parameters
-	int ret = avcodec_open2( &avCodecContext, &_codec.getAVCodec(), NULL );
-	if( ret < 0 )
-	{
-		char err[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror( ret, err, sizeof(err) );
-		std::string msg = "could not open video encoder " + _codec.getCodecName() +": ";
-		msg += err;
-		throw std::runtime_error( msg );
-	}
+	_codec.open();
 }
 
 
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -23,7 +23,7 @@ class AvExport FileProperties
 	FileProperties( const FormatContext& formatContext );
 
 	std::string getFilename() const;
-	std::string getFormatName() const;
+	std::string getFormatName() const;  ///< A comma separated list of short names for the format
 	std::string getFormatLongName() const;
 
 	size_t getProgramsCount() const;
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -27,26 +27,17 @@ InputStream::InputStream( InputFile& inputFile, const size_t streamIndex )
 	{
 		case AVMEDIA_TYPE_VIDEO:
 		{
-			VideoCodec* videoCodec = new VideoCodec( eCodecTypeDecoder, context->codec_id );
-			videoCodec->setImageParameters( context->width, context->height, context->pix_fmt );
-			videoCodec->setTimeBase( context->time_base.num, context->time_base.den, context->ticks_per_frame );
-
-			_codec = videoCodec;
+			_codec = new VideoCodec( eCodecTypeDecoder, *context );
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
-			AudioCodec* audioCodec = new AudioCodec( eCodecTypeDecoder, context->codec_id );
-			audioCodec->setAudioParameters( context->sample_rate, context->channels, context->sample_fmt );
-
-			_codec = audioCodec;
+			_codec = new AudioCodec( eCodecTypeDecoder, *context );
 			break;
 		}
 		case AVMEDIA_TYPE_DATA:
 		{
-			DataCodec* dataCodec = new DataCodec( eCodecTypeDecoder, context->codec_id );
-
-			_codec= dataCodec;
+			_codec = new DataCodec( eCodecTypeDecoder, *context );
 			break;
 		}
 		default:
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -11,23 +11,22 @@ def testRewrapAudioStream():
 	"""
 	Rewrap one audio stream.
 	"""
+        # get src file of wrap
 	inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_FILE']
-	outputFileName = "testRewrapAudioStream.wav"
+	src_inputFile = av.InputFile( inputFileName )
+	progress = av.NoDisplayProgress()
+	src_inputFile.analyse( progress )
+	src_properties = src_inputFile.getProperties()
+	src_audioStream = src_properties.getAudioProperties()[0]
 
+	formatList = src_properties.getFormatName().split(",")
+	outputFileName = "testRewrapAudioStream." + formatList[0]
 	ouputFile = av.OutputFile( outputFileName )
-	transcoder = av.Transcoder( ouputFile )
 
+	transcoder = av.Transcoder( ouputFile )
 	transcoder.add( inputFileName, 0, "" )
-
-	progress = av.NoDisplayProgress()
 	transcoder.process( progress )
 
-	# get src file of wrap
-	src_inputFile = av.InputFile( inputFileName )
-	src_inputFile.analyse( progress )
-	src_properties = src_inputFile.getProperties()
-	src_audioStream = src_properties.getAudioProperties()[0]
-
 	# get dst file of wrap
 	dst_inputFile = av.InputFile( outputFileName )
 	dst_inputFile.analyse( progress, av.eAnalyseLevelHeader )
@@ -68,23 +67,22 @@ def testRewrapVideoStream():
 	"""
 	Rewrap one video stream.
 	"""
+	# get src file of wrap
 	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
-	outputFileName = "testRewrapVideoStream.avi"
+	src_inputFile = av.InputFile( inputFileName )
+	progress = av.NoDisplayProgress()
+	src_inputFile.analyse( progress )
+	src_properties = src_inputFile.getProperties()	
+        src_videoStream = src_properties.getVideoProperties()[0]
 
+	formatList = src_properties.getFormatName().split(",")
+	outputFileName = "testRewrapVideoStream." + formatList[0]
 	ouputFile = av.OutputFile( outputFileName )
-	transcoder = av.Transcoder( ouputFile )
 
+	transcoder = av.Transcoder( ouputFile )
 	transcoder.add( inputFileName, 0, "" )
-
-	progress = av.NoDisplayProgress()
 	transcoder.process( progress )
 
-	# get src file of wrap
-	src_inputFile = av.InputFile( inputFileName )
-	src_inputFile.analyse( progress )
-	src_properties = src_inputFile.getProperties()	
-        src_videoStream = src_properties.getVideoProperties()[0]
-
 	# get dst file of wrap
 	dst_inputFile = av.InputFile( outputFileName )
 	dst_inputFile.analyse( progress )

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ AudioCodec::AudioCodec( const ECodecType type, const AVCodecID codecId )`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`-AudioCodec::AudioCodec( const ICodec& codec )`
`19`		`- : ICodec( codec )`
	`18`	`+AudioCodec::AudioCodec( const ECodecType type, AVCodecContext& avCodecContext )`
	`19`	`+ : ICodec( type, avCodecContext )`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ DataCodec::DataCodec( const ECodecType type, const AVCodecID codecId )`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`-DataCodec::DataCodec( const ICodec& codec )`
`17`		`- : ICodec( codec )`
	`16`	`+DataCodec::DataCodec( const ECodecType type, AVCodecContext& avCodecContext )`
	`17`	`+ : ICodec( type, avCodecContext )`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class AvExport DataCodec : public ICodec`
`11`	`11`	`public:`
`12`	`12`	`DataCodec( const ECodecType type, const std::string& codecName = "" );`
`13`	`13`	`DataCodec( const ECodecType type, const AVCodecID codecId );`
`14`		`- DataCodec( const ICodec& codec );`
	`14`	`+ DataCodec( const ECodecType type, AVCodecContext& avCodecContext );`
`15`	`15`	`};`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ VideoCodec::VideoCodec( const ECodecType type, const AVCodecID codecId )`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`-VideoCodec::VideoCodec( const ICodec& codec )`
`19`		`- : ICodec( codec )`
	`18`	`+VideoCodec::VideoCodec( const ECodecType type, AVCodecContext& avCodecContext )`
	`19`	`+ : ICodec( type, avCodecContext )`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`