Decoders: set threads before any other options

Clement Champetier · Clement Champetier · commit 07582b2f0648 · 2015-02-26T12:12:53.000+01:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -151,20 +151,26 @@ bool AudioDecoder::decodeNextFrame()
 
 void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
 {
-	// set threads if not in profile
-	if( ! profile.count( "threads" ) )
-		_inputStream->getAudioCodec().getOption( "threads" ).setString( "auto" );
+	AudioCodec& codec = _inputStream->getAudioCodec();
 
+	// set threads before any other options
+	if( profile.count( constants::avProfileThreads ) )
+		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
+	else
+		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+
+	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
 			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType )
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileThreads )
 			continue;
 
 		try
 		{
-			Option& decodeOption = _inputStream->getAudioCodec().getOption( (*it).first );
+			Option& decodeOption = codec.getOption( (*it).first );
 			decodeOption.setString( (*it).second );
 		}
 		catch( std::exception& e )
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -110,20 +110,26 @@ void VideoDecoder::flushDecoder()
 
 void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
 {
-	// set threads if not in profile
-	if( ! profile.count( "threads" ) )
-		_inputStream->getVideoCodec().getOption( "threads" ).setString( "auto" );
+	VideoCodec& codec = _inputStream->getVideoCodec();
 
+	// set threads before any other options
+	if( profile.count( constants::avProfileThreads ) )
+		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
+	else
+		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+
+	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
 			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType )
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileThreads )
 			continue;
 
 		try
 		{
-			Option& decodeOption = _inputStream->getVideoCodec().getOption( (*it).first );
+			Option& decodeOption = codec.getOption( (*it).first );
 			decodeOption.setString( (*it).second );
 		}
 		catch( std::exception& e )
