Encoders: set threads before any other options

Clement Champetier · Clement Champetier · commit 0354acf4dc57 · 2015-02-26T12:12:38.000+01:00
Add constants 'avProfileThreads' in ProfileLoader.
diff --git a/src/AvTranscoder/ProfileLoader.hpp b/src/AvTranscoder/ProfileLoader.hpp
@@ -28,6 +28,7 @@ namespace constants
 	const std::string avProfileHeight = "height";
 	const std::string avProfileSampleRate = "ar";
 	const std::string avProfileChannel = "ac";
+	const std::string avProfileThreads = "threads";
 }
 
 class AvExport ProfileLoader
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -146,9 +146,12 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 	// set sampleRate, number of channels, sample format
 	_codec.setAudioParameters( frameDesc );
 
-	// set threads if not in profile
-	if( ! profile.count( "threads" ) )
-		_codec.getOption( "threads" ).setString( "auto" );
+	// 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 encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
@@ -157,7 +160,8 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
 			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileSampleFormat )
+			(*it).first == constants::avProfileSampleFormat ||
+			(*it).first == constants::avProfileThreads )
 			continue;
 
 		try
@@ -177,7 +181,8 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
 			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileSampleFormat )
+			(*it).first == constants::avProfileSampleFormat ||
+			(*it).first == constants::avProfileThreads )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -137,9 +137,11 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 	// set width, height, pixel format, fps
 	_codec.setImageParameters( frameDesc );
 
-	// set threads if not in profile
-	if( ! profile.count( "threads" ) )
-		_codec.getOption( "threads" ).setString( "auto" );
+	// 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 encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
@@ -151,7 +153,8 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 			(*it).first == constants::avProfileWidth ||
 			(*it).first == constants::avProfileHeight ||
 			(*it).first == constants::avProfilePixelFormat ||
-			(*it).first == constants::avProfileFrameRate )
+			(*it).first == constants::avProfileFrameRate ||
+			(*it).first == constants::avProfileThreads )
 			continue;
 
 		try
@@ -174,7 +177,8 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 			(*it).first == constants::avProfileWidth ||
 			(*it).first == constants::avProfileHeight ||
 			(*it).first == constants::avProfilePixelFormat ||
-			(*it).first == constants::avProfileFrameRate )
+			(*it).first == constants::avProfileFrameRate ||
+			(*it).first == constants::avProfileThreads  )
 			continue;
 
 		try

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ namespace constants`
`28`	`28`	`const std::string avProfileHeight = "height";`
`29`	`29`	`const std::string avProfileSampleRate = "ar";`
`30`	`30`	`const std::string avProfileChannel = "ac";`
	`31`	`+ const std::string avProfileThreads = "threads";`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`class AvExport ProfileLoader`