decoders: renamed 'subStreamIndex' parameter to 'channelIndex'

Clement Champetier · Clement Champetier · commit db709eb9dbd3 · 2015-12-01T14:25:16.000+01:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -124,7 +124,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t channelIndex )
 {
 	if( ! decodeNextFrame() )
 		return false;
@@ -138,7 +138,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn
 	size_t nbSubStreams = avCodecContext.channels;
 	size_t bytePerSample = av_get_bytes_per_sample( (AVSampleFormat)_frame->format );
 
-	if( subStreamIndex > nbSubStreams - 1 )
+	if( channelIndex > nbSubStreams - 1 )
 	{
 		throw std::runtime_error( "The subStream doesn't exist");
 	}
@@ -155,7 +155,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn
 	unsigned char* dst = audioBuffer.getData();
 
 	// offset
-	src += subStreamIndex * bytePerSample;
+	src += channelIndex * bytePerSample;
 
 	for( int sample = 0; sample < _frame->nb_samples; ++sample )
 	{
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -19,7 +19,7 @@ class AvExport AudioDecoder : public IDecoder
 	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() );
 
 	bool decodeNextFrame( Frame& frameBuffer );
-	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
+	bool decodeNextFrame( Frame& frameBuffer, const size_t channelIndex );
 
 	void flushDecoder();
 
diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -30,10 +30,10 @@ class AvExport IDecoder
 	/**
 	 * @brief Decode substream of next frame
 	 * @param frameBuffer: the frame decoded
-	 * @param subStreamIndex: index of substream to extract
+	 * @param channelIndex: index of channel to extract
 	 * @return status of decoding
 	 */
-	virtual bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex ) = 0;
+	virtual bool decodeNextFrame( Frame& frameBuffer, const size_t channelIndex ) = 0;
 
 	/**
 	 * @brief Set the next frame of the input stream (which bypass the work of decoding)
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -116,7 +116,7 @@ bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t channelIndex )
 {
 	return false;
 }
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -19,7 +19,7 @@ class AvExport VideoDecoder : public IDecoder
 	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() );
 
 	bool decodeNextFrame( Frame& frameBuffer );
-	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
+	bool decodeNextFrame( Frame& frameBuffer, const size_t channelIndex );
 
 	void flushDecoder();
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )`
`124`	`124`	`return true;`
`125`	`125`	`}`
`126`	`126`
`127`		`-bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`127`	`+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t channelIndex )`
`128`	`128`	`{`
`129`	`129`	`if( ! decodeNextFrame() )`
`130`	`130`	`return false;`
`@@ -138,7 +138,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn`
`138`	`138`	`size_t nbSubStreams = avCodecContext.channels;`
`139`	`139`	`size_t bytePerSample = av_get_bytes_per_sample( (AVSampleFormat)_frame->format );`
`140`	`140`
`141`		`- if( subStreamIndex > nbSubStreams - 1 )`
	`141`	`+ if( channelIndex > nbSubStreams - 1 )`
`142`	`142`	`{`
`143`	`143`	`throw std::runtime_error( "The subStream doesn't exist");`
`144`	`144`	`}`
`@@ -155,7 +155,7 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn`
`155`	`155`	`unsigned char* dst = audioBuffer.getData();`
`156`	`156`
`157`	`157`	`// offset`
`158`		`- src += subStreamIndex * bytePerSample;`
	`158`	`+ src += channelIndex * bytePerSample;`
`159`	`159`
`160`	`160`	`for( int sample = 0; sample < _frame->nb_samples; ++sample )`
`161`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )`
`116`	`116`	`return true;`
`117`	`117`	`}`
`118`	`118`
`119`		`-bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`119`	`+bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t channelIndex )`
`120`	`120`	`{`
`121`	`121`	`return false;`
`122`	`122`	`}`