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

Clement Champetier · Clement Champetier · commit 7c4a9d0cad6a · 2015-01-13T19:13:48.000+01:00
diff --git a/src/AvTranscoder/Library.cpp b/src/AvTranscoder/Library.cpp
@@ -91,7 +91,6 @@ Libraries getLibraries()
 
 std::vector<std::string> getInputExtensions()
 {
-	av_register_all();
 	std::vector<std::string> extensions;
 	AVInputFormat* iFormat = NULL;
 
@@ -130,7 +129,6 @@ std::vector<std::string> getInputExtensions()
 
 std::vector<std::string> getOutputExtensions()
 {
-	av_register_all();
 	std::vector<std::string> extensions;
 	AVOutputFormat* oFormat = NULL;
 
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -16,8 +16,6 @@ ICodec::ICodec( const ECodecType type, const std::string& codecName )
 	, _isCodecContextAllocated( true )
 	, _type( type )
 {
-	avcodec_register_all();  // TODO: call only once
-
 	setCodec( type, codecName );
 	allocateContext();
 	loadCodecOptions();
@@ -29,8 +27,6 @@ ICodec::ICodec( const ECodecType type, const AVCodecID codecId )
 	, _isCodecContextAllocated( true )
 	, _type( type )
 {
-	avcodec_register_all();  // TODO: call only once
-
 	setCodec( type, codecId );
 	allocateContext();
 	loadCodecOptions();
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -12,6 +12,11 @@ extern "C" {
 namespace avtranscoder
 {
 
+void preloadCodecsAndFormats()
+{
+	av_register_all();
+}
+
 void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars )
 {
 	char* part = strtok( const_cast<char*>( inputString.c_str() ), splitChars.c_str() );
@@ -47,7 +52,6 @@ std::string getFormat( const std::string& filename )
 {
 	std::string format( "" );
 	
-	av_register_all();
 	AVOutputFormat* avOutputFormat = av_guess_format( NULL, filename.c_str(), NULL);
 	if( avOutputFormat )
 	{
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -56,6 +56,9 @@ namespace avtranscoder
 
 typedef AVRational Rational;
 
+/// Register all the codecs and formats which are enabled at configuration time.
+void preloadCodecsAndFormats();
+
 #ifndef SWIG
 void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
 int getFilesInDir( const std::string& dir, std::vector< std::string >& files );
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -12,8 +12,6 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )
 	, _options()
 	, _isOpen( true )
 {
-	av_register_all();  // TODO: call it once
-
 	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );
 	if( ret < 0 )
 	{
@@ -33,8 +31,6 @@ FormatContext::FormatContext( int req_flags )
 	, _options()
 	, _isOpen( false )
 {
-	av_register_all();  // TODO: call it once
-
 	_avFormatContext = avformat_alloc_context();
 	loadOptions( _options, _avFormatContext, req_flags );
 }
diff --git a/test/pyTest/testProperties.py b/test/pyTest/testProperties.py
@@ -4,6 +4,8 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
 
 def testAddMetadataDate():
 	"""
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
@@ -4,6 +4,8 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
 
 def testSetVideoFrame():
 	"""
diff --git a/test/pyTest/testTranscoderAdd.py b/test/pyTest/testTranscoderAdd.py
@@ -4,6 +4,8 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
 
 def testAddStreamTranscoder():
 	"""
diff --git a/test/pyTest/testTranscoderDummy.py b/test/pyTest/testTranscoderDummy.py
@@ -2,6 +2,8 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
 
 @raises(RuntimeError)
 def testTranscodeNoStream():
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -4,6 +4,9 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
+
 def testRewrapAudioStream():
 	"""
 	Rewrap one audio stream.
diff --git a/test/pyTest/testTranscoderTranscode.py b/test/pyTest/testTranscoderTranscode.py
@@ -4,6 +4,8 @@
 
 from pyAvTranscoder import avtranscoder as av
 
+av.preloadCodecsAndFormats()
+
 
 def testTranscodeWave24b48kmono():
 	"""

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ Libraries getLibraries()`
`91`	`91`
`92`	`92`	`std::vector<std::string> getInputExtensions()`
`93`	`93`	`{`
`94`		`- av_register_all();`
`95`	`94`	`std::vector<std::string> extensions;`
`96`	`95`	`AVInputFormat* iFormat = NULL;`
`97`	`96`
`@@ -130,7 +129,6 @@ std::vector<std::string> getInputExtensions()`
`130`	`129`
`131`	`130`	`std::vector<std::string> getOutputExtensions()`
`132`	`131`	`{`
`133`		`- av_register_all();`
`134`	`132`	`std::vector<std::string> extensions;`
`135`	`133`	`AVOutputFormat* oFormat = NULL;`
`136`	`134`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ extern "C" {`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
	`15`	`+void preloadCodecsAndFormats()`
	`16`	`+{`
	`17`	`+ av_register_all();`
	`18`	`+}`
	`19`	`+`
`15`	`20`	`void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars )`
`16`	`21`	`{`
`17`	`22`	`char* part = strtok( const_cast<char*>( inputString.c_str() ), splitChars.c_str() );`
`@@ -47,7 +52,6 @@ std::string getFormat( const std::string& filename )`
`47`	`52`	`{`
`48`	`53`	`std::string format( "" );`
`49`	`54`
`50`		`- av_register_all();`
`51`	`55`	`AVOutputFormat* avOutputFormat = av_guess_format( NULL, filename.c_str(), NULL);`
`52`	`56`	`if( avOutputFormat )`
`53`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )`
`12`	`12`	`, _options()`
`13`	`13`	`, _isOpen( true )`
`14`	`14`	`{`
`15`		`- av_register_all(); // TODO: call it once`
`16`		`-`
`17`	`15`	`int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );`
`18`	`16`	`if( ret < 0 )`
`19`	`17`	`{`
`@@ -33,8 +31,6 @@ FormatContext::FormatContext( int req_flags )`
`33`	`31`	`, _options()`
`34`	`32`	`, _isOpen( false )`
`35`	`33`	`{`
`36`		`- av_register_all(); // TODO: call it once`
`37`		`-`
`38`	`34`	`_avFormatContext = avformat_alloc_context();`
`39`	`35`	`loadOptions( _options, _avFormatContext, req_flags );`
`40`	`36`	`}`