Transcoder: getProfileFromFile copy the correct number of channels

Clement Champetier · Clement Champetier · commit 3e81855950c3 · 2015-02-10T18:34:53.000+01:00
We manage the demultiplexing after calling this more generic function.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -342,6 +342,11 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	InputFile* referenceFile = addInputFile( filename, streamIndex );
 	ProfileLoader::Profile profile = getProfileFromFile( *referenceFile, streamIndex );
 
+	// override channels parameter to manage demultiplexing
+	ProfileLoader::Profile::iterator it = profile.find( constants::avProfileChannel ); 
+	if( it != profile.end() )
+		it->second = "1";
+
 	addTranscodeStream( filename, streamIndex, subStreamIndex, profile, offset );
 }
 
@@ -465,7 +470,9 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con
 		std::stringstream ss;
 		ss << audioProperties->getSampleRate();
 		profile[ constants::avProfileSampleRate ] = ss.str();
-		profile[ constants::avProfileChannel ] = "1";
+		ss.clear();
+		ss << audioProperties->getChannels();
+		profile[ constants::avProfileChannel ] = ss.str();
 	}
 
 	return profile;
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -141,7 +141,7 @@ class AvExport Transcoder
 private:
 	void addRewrapStream( const std::string& filename, const size_t streamIndex );
 
-	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, const double offset );  ///< Get profile from input
+	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, const double offset );
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, ProfileLoader::Profile& profile, const double offset = 0 );
 
 	void addDummyStream( const ProfileLoader::Profile& profile, const ICodec& codec );
