Transcoder: fix subStreamIndex type of private addTranscodeStream functions

Clement Champetier · Clement Champetier · commit bb2e0a248544 · 2015-02-27T13:47:50.000+01:00
* subStreamIndex can be negative, and indicates that we will transcode
all channels.
* Log this info.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -290,7 +290,7 @@ void Transcoder::addRewrapStream( const std::string& filename, const size_t stre
 	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 }
 
-void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, const double offset )
+void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const double offset )
 {
 	// Get profile from input file
 	InputFile* referenceFile = addInputFile( filename, streamIndex );
@@ -304,13 +304,17 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	addTranscodeStream( filename, streamIndex, subStreamIndex, profile, offset );
 }
 
-void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, ProfileLoader::Profile& profile, const double offset )
+void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, ProfileLoader::Profile& profile, const double offset )
 {
 	// Add profile
 	_profileLoader.loadProfile( profile );
 
 	std::stringstream os;
-	os << "Add transcode stream from file '" << filename << "' / index=" << streamIndex << " / channel=" << subStreamIndex;
+	os << "Add transcode stream from file '" << filename << "' / index=" << streamIndex << " / channel=";
+	if( subStreamIndex < 0 )
+		os << "all";
+	else
+		os << subStreamIndex;
 	os << " / encodingProfile=" << profile.at( constants::avProfileIdentificatorHuman ) << " / offset=" << offset << "s";
 	Logger::info( os.str() );
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -134,8 +134,8 @@ 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 );
-	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, ProfileLoader::Profile& profile, const double offset = 0 );
+	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const double offset );
+	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, ProfileLoader::Profile& profile, const double offset = 0 );
 
 	void addDummyStream( const ProfileLoader::Profile& profile, const ICodec& codec );
 

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void Transcoder::addRewrapStream( const std::string& filename, const size_t stre`
`290`	`290`	`_streamTranscoders.push_back( _streamTranscodersAllocated.back() );`
`291`	`291`	`}`
`292`	`292`
`293`		`-void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, const double offset )`
	`293`	`+void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const double offset )`
`294`	`294`	`{`
`295`	`295`	`// Get profile from input file`
`296`	`296`	`InputFile* referenceFile = addInputFile( filename, streamIndex );`
`@@ -304,13 +304,17 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s`
`304`	`304`	`addTranscodeStream( filename, streamIndex, subStreamIndex, profile, offset );`
`305`	`305`	`}`
`306`	`306`
`307`		`-void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, ProfileLoader::Profile& profile, const double offset )`
	`307`	`+void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, ProfileLoader::Profile& profile, const double offset )`
`308`	`308`	`{`
`309`	`309`	`// Add profile`
`310`	`310`	`_profileLoader.loadProfile( profile );`
`311`	`311`
`312`	`312`	`std::stringstream os;`
`313`		`- os << "Add transcode stream from file '" << filename << "' / index=" << streamIndex << " / channel=" << subStreamIndex;`
	`313`	`+ os << "Add transcode stream from file '" << filename << "' / index=" << streamIndex << " / channel=";`
	`314`	`+ if( subStreamIndex < 0 )`
	`315`	`+ os << "all";`
	`316`	`+ else`
	`317`	`+ os << subStreamIndex;`
`314`	`318`	`os << " / encodingProfile=" << profile.at( constants::avProfileIdentificatorHuman ) << " / offset=" << offset << "s";`
`315`	`319`	`Logger::info( os.str() );`
`316`	`320`