hotfix: encoders/decoders - by default set threads to the value expected by the codec

Clement Champetier · Clement Champetier · commit 6b4373c5f9bf · 2015-05-05T17:30:43.000+02:00
If indicated in profile, force threads value.
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -155,7 +155,7 @@ void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );
 
 	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -114,7 +114,7 @@ void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );
 
 	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -144,7 +144,7 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 	if( profile.count( constants::avProfileThreads ) )
 		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );
 
 
 	// set encoder options
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -137,7 +137,7 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 	if( profile.count( constants::avProfileThreads ) )
 		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );
 
 	// set encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -133,7 +133,7 @@ StreamTranscoder::StreamTranscoder(
 		{
 			// input decoder
 			VideoDecoder* inputVideo = new VideoDecoder( *static_cast<InputStream*>( _inputStream ) );
-			// set decoder options with empty profile to set some key options to specific values (example: threads to auto)
+			// set decoder options with empty profile to set some key options to specific values
 			inputVideo->setProfile( ProfileLoader::Profile() );
 			inputVideo->setup();
 			_inputDecoder = inputVideo;
@@ -168,7 +168,7 @@ StreamTranscoder::StreamTranscoder(
 		{
 			// input decoder
 			AudioDecoder* inputAudio = new AudioDecoder( *static_cast<InputStream*>( _inputStream ) );
-			// set decoder options with empty profile to set some key options to specific values (example: threads to auto)
+			// set decoder options with empty profile to set some key options to specific values
 			inputAudio->setProfile( ProfileLoader::Profile() );
 			inputAudio->setup();
 			_inputDecoder = inputAudio;
