AudioTransform: rename _previousProcessedAudioFrameSize...

Clement Champetier · Clement Champetier · commit 9e57c8a0da09 · 2015-03-10T18:29:13.000+01:00
... To _nbSamplesOfPreviousFrame.
Because the frame size can change only if number of samples change.
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -32,7 +32,7 @@ namespace avtranscoder
 
 AudioTransform::AudioTransform()
 	: _audioConvertContext( NULL )
-	, _previousProcessedAudioFrameSize( 0 )
+	, _nbSamplesOfPreviousFrame( 0 )
 	, _isInit    ( false )
 {
 }
@@ -83,15 +83,16 @@ void AudioTransform::initFrames( const Frame& srcFrame, Frame& dstFrame )
 	// set nbSamples of output frame
 	dst.setNbSamples( src.getNbSamples() );
 
-	_previousProcessedAudioFrameSize = srcFrame.getSize();
+	_nbSamplesOfPreviousFrame = src.getNbSamples();
 }
 
 void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
 	if( ! _isInit )
 		_isInit = init( srcFrame, dstFrame );
 
-	if( srcFrame.getSize() != _previousProcessedAudioFrameSize )
+	const AudioFrame& srcAudioFrame = static_cast<const AudioFrame&>( srcFrame );
+	if( srcAudioFrame.getNbSamples() != _nbSamplesOfPreviousFrame )
 		initFrames( srcFrame, dstFrame );
 
 	const unsigned char* srcData = srcFrame.getData();
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -30,10 +30,11 @@ class AvExport AudioTransform : public ITransform
 
 	/// Resize output buffer if source has a different size from the last process
 	void initFrames( const Frame& srcFrame, Frame& dstFrame );
-	
+
+private:
 	ResampleContext* _audioConvertContext;
-	
-	size_t _previousProcessedAudioFrameSize;
+
+	size_t _nbSamplesOfPreviousFrame;  ///< To check if the number of samples change between frames
 
 	bool _isInit;
 };

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace avtranscoder`
`32`	`32`
`33`	`33`	`AudioTransform::AudioTransform()`
`34`	`34`	`: _audioConvertContext( NULL )`
`35`		`- , _previousProcessedAudioFrameSize( 0 )`
	`35`	`+ , _nbSamplesOfPreviousFrame( 0 )`
`36`	`36`	`, _isInit ( false )`
`37`	`37`	`{`
`38`	`38`	`}`
`@@ -83,15 +83,16 @@ void AudioTransform::initFrames( const Frame& srcFrame, Frame& dstFrame )`
`83`	`83`	`// set nbSamples of output frame`
`84`	`84`	`dst.setNbSamples( src.getNbSamples() );`
`85`	`85`
`86`		`- _previousProcessedAudioFrameSize = srcFrame.getSize();`
	`86`	`+ _nbSamplesOfPreviousFrame = src.getNbSamples();`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`90`	`90`	`{`
`91`	`91`	`if( ! _isInit )`
`92`	`92`	`_isInit = init( srcFrame, dstFrame );`
`93`	`93`
`94`		`- if( srcFrame.getSize() != _previousProcessedAudioFrameSize )`
	`94`	`+ const AudioFrame& srcAudioFrame = static_cast<const AudioFrame&>( srcFrame );`
	`95`	`+ if( srcAudioFrame.getNbSamples() != _nbSamplesOfPreviousFrame )`
`95`	`96`	`initFrames( srcFrame, dstFrame );`
`96`	`97`
`97`	`98`	`const unsigned char* srcData = srcFrame.getData();`