StreamTranscoder: set outputAudioFrameDesc with setParameters

Clement Champetier · Clement Champetier · commit dfdeca4bd47c · 2014-07-24T16:53:30.000+02:00
* If a subStream is selected, set channels of the frameDesc used to
instanciate _sourceBuffer.
* Add todo.
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -11,7 +11,6 @@ extern "C" {
 
 #include <iostream>
 #include <stdexcept>
-#include <cstdlib>
 
 namespace avtranscoder
 {
@@ -186,10 +185,8 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
 	
 	_audioDesc.setCodec( desc.find( Profile::avProfileCodec )->second );
 	
-	size_t sample_rate = std::strtoul( desc.find( Profile::avProfileSampleRate )->second.c_str(), NULL, 0 );
-	size_t channels = std::strtoul( desc.find( Profile::avProfileChannel )->second.c_str(), NULL, 0 );
-	_audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc.find( Profile::avProfileSampleFormat )->second.c_str() ) );
-	
+	_audioDesc.setAudioParameters( frameDesc );
+
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -102,16 +102,23 @@ StreamTranscoder::StreamTranscoder(
 			OutputAudio* outputAudio = new OutputAudio();
 
 			_outputEssence = outputAudio;
-			AudioFrameDesc audioFrameDesc( _inputStream->getAudioDesc().getFrameDesc() );
 			
+			AudioFrameDesc outputFrameDesc( _inputStream->getAudioDesc().getFrameDesc() );
+			outputFrameDesc.setParameters( profile );
 			if( subStreamIndex > -1 )
-				audioFrameDesc.setChannels( 1 );
-
-			outputAudio->setProfile( profile, audioFrameDesc );
+			{
+				// @todo manage downmix ?
+				outputFrameDesc.setChannels( 1 );
+			}
+			outputAudio->setProfile( profile, outputFrameDesc );
 
 			_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
 
-			_sourceBuffer = new AudioFrame( audioFrameDesc );
+			AudioFrameDesc inputFrameDesc( _inputStream->getAudioDesc().getFrameDesc() );
+			if( subStreamIndex > -1 )
+				inputFrameDesc.setChannels( 1 );
+			
+			_sourceBuffer = new AudioFrame( inputFrameDesc );
 			_frameBuffer  = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
 			
 			_transform = new AudioEssenceTransform();
