AudioTransform: rename initFrames to updateOutputFrame

Clement Champetier · Clement Champetier · commit e887b1dec86d · 2015-03-10T18:33:48.000+01:00
* The functions only update the output frame.
* We update some attributes of the transform after this function (which
is now const).
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -69,31 +69,32 @@ bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	return true;
 }
 
-void AudioTransform::initFrames( const Frame& srcFrame, Frame& dstFrame )
+void AudioTransform::updateOutputFrame( const size_t nbInputSamples, Frame& dstFrame ) const
 {
-	const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );
 	AudioFrame& dst = static_cast<AudioFrame&>( dstFrame );
 
 	// resize buffer of output frame
 	const int dstSampleSize = av_get_bytes_per_sample( dst.desc().getSampleFormat() );
-	const size_t bufferSizeNeeded = src.getNbSamples() * dst.desc().getChannels() * dstSampleSize;
+	const size_t bufferSizeNeeded = nbInputSamples * dst.desc().getChannels() * dstSampleSize;
 	if( bufferSizeNeeded > dstFrame.getSize() )
 		dstFrame.resize( bufferSizeNeeded );
 
 	// set nbSamples of output frame
-	dst.setNbSamples( src.getNbSamples() );
-
-	_nbSamplesOfPreviousFrame = src.getNbSamples();
+	dst.setNbSamples( nbInputSamples );
 }
 
 void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
 	if( ! _isInit )
 		_isInit = init( srcFrame, dstFrame );
 
+	// if number of samples change from previous frame
 	const AudioFrame& srcAudioFrame = static_cast<const AudioFrame&>( srcFrame );
 	if( srcAudioFrame.getNbSamples() != _nbSamplesOfPreviousFrame )
-		initFrames( srcFrame, dstFrame );
+	{
+		updateOutputFrame( srcAudioFrame.getNbSamples(), dstFrame );
+		_nbSamplesOfPreviousFrame = srcAudioFrame.getNbSamples();
+	}
 
 	const unsigned char* srcData = srcFrame.getData();
 	unsigned char* dstData = dstFrame.getData();
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -28,8 +28,8 @@ class AvExport AudioTransform : public ITransform
 private:
 	bool init( const Frame& srcFrame, const Frame& dstFrame );
 
-	/// Resize output buffer if source has a different size from the last process
-	void initFrames( const Frame& srcFrame, Frame& dstFrame );
+	/// Update output buffer if source has a different size from the last process
+	void updateOutputFrame( const size_t nbInputSamples, Frame& dstFrame ) const;
 
 private:
 	ResampleContext* _audioConvertContext;
