Video/AudioDecoder: set threads options to auto if no set by the user

Clement Champetier · Clement Champetier · commit 108284465358 · 2015-01-30T10:58:10.000+01:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -161,4 +161,29 @@ bool AudioDecoder::decodeNextFrame()
 	return true;
 }
 
+void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
+{
+	// set threads if not in profile
+	if( ! profile.count( "threads" ) )
+		_inputStream->getAudioCodec().getOption( "threads" ).setString( "auto" );
+
+	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 )
+			continue;
+
+		try
+		{
+			Option& decodeOption = _inputStream->getAudioCodec().getOption( (*it).first );
+			decodeOption.setString( (*it).second );
+		}
+		catch( std::exception& e )
+		{
+			std::cout << "[AudioDecoder] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+		}
+	}
+}
+
 }
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -2,6 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 
 #include "IDecoder.hpp"
+#include <AvTranscoder/ProfileLoader.hpp>
 
 struct AVFrame;
 
@@ -21,6 +22,8 @@ class AvExport AudioDecoder : public IDecoder
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
+	void setProfile( const ProfileLoader::Profile& profile );
+
 private:
 	bool decodeNextFrame();
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -119,6 +119,10 @@ 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" );
+
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,10 @@ void VideoDecoder::flushDecoder()`
`119`	`119`
`120`	`120`	`void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )`
`121`	`121`	`{`
	`122`	`+ // set threads if not in profile`
	`123`	`+ if( ! profile.count( "threads" ) )`
	`124`	`+ _inputStream->getVideoCodec().getOption( "threads" ).setString( "auto" );`
	`125`	`+`
`122`	`126`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
`123`	`127`	`{`
`124`	`128`	`if( (*it).first == constants::avProfileIdentificator \|\|`