Commit6b4373c

Clement Champetier

committed

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

If indicated in profile, force threads value.

1 parenta35585f commit6b4373cCopy full SHA for 6b4373c

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )`
`155`	`155`	`if( profile.count( constants::avProfileThreads ) )`
`156`	`156`	`codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );`
`157`	`157`	`else`
`158`		`-codec.getOption( constants::avProfileThreads ).setString("auto" );`
	`158`	`+codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );`
`159`	`159`
`160`	`160`	`// set decoder options`
`161`	`161`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )`
`114`	`114`	`if( profile.count( constants::avProfileThreads ) )`
`115`	`115`	`codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );`
`116`	`116`	`else`
`117`		`-codec.getOption( constants::avProfileThreads ).setString("auto" );`
	`117`	`+codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );`
`118`	`118`
`119`	`119`	`// set decoder options`
`120`	`120`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi`
`144`	`144`	`if( profile.count( constants::avProfileThreads ) )`
`145`	`145`	`_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );`
`146`	`146`	`else`
`147`		`-_codec.getOption( constants::avProfileThreads ).setString("auto" );`
	`147`	`+_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );`
`148`	`148`
`149`	`149`
`150`	`150`	`// set encoder options`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr`
`137`	`137`	`if( profile.count( constants::avProfileThreads ) )`
`138`	`138`	`_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );`
`139`	`139`	`else`
`140`		`-_codec.getOption( constants::avProfileThreads ).setString("auto" );`
	`140`	`+_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );`
`141`	`141`
`142`	`142`	`// set encoder options`
`143`	`143`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ StreamTranscoder::StreamTranscoder(`
`133`	`133`	`{`
`134`	`134`	`// input decoder`
`135`	`135`	`VideoDecoder* inputVideo =newVideoDecoder( static_cast<InputStream>( _inputStream ) );`
`136`		`-// set decoder options with empty profile to set some key options to specific values (example: threads to auto)`
	`136`	`+// set decoder options with empty profile to set some key options to specific values`
`137`	`137`	`inputVideo->setProfile(ProfileLoader::Profile() );`
`138`	`138`	`inputVideo->setup();`
`139`	`139`	`_inputDecoder = inputVideo;`
`@@ -168,7 +168,7 @@ StreamTranscoder::StreamTranscoder(`
`168`	`168`	`{`
`169`	`169`	`// input decoder`
`170`	`170`	`AudioDecoder* inputAudio =newAudioDecoder( static_cast<InputStream>( _inputStream ) );`
`171`		`-// set decoder options with empty profile to set some key options to specific values (example: threads to auto)`
	`171`	`+// set decoder options with empty profile to set some key options to specific values`
`172`	`172`	`inputAudio->setProfile(ProfileLoader::Profile() );`
`173`	`173`	`inputAudio->setup();`
`174`	`174`	`_inputDecoder = inputAudio;`

Comments

(0)