Transcoding: fix the audio output frame size problem when variable audio frame size in input

Valentin Noel · Valentin Noel · commit 96bf6fe49d72 · 2014-11-21T18:04:01.000+01:00
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -32,6 +32,7 @@ namespace avtranscoder
 
 AudioTransform::AudioTransform()
 	: _audioConvertContext( NULL )
+	, _previousProcessedAudioFrameSize( 0 )
 	, _isInit    ( false )
 {
 }
@@ -64,11 +65,24 @@ bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	return true;
 }
 
+bool AudioTransform::initFrames( const Frame& srcFrame, Frame& dstFrame )
+{
+	const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );
+	const AudioFrame& dst = static_cast<const AudioFrame&>( dstFrame );
+
+	int dstSampleSize = av_get_bytes_per_sample( dst.desc().getAVSampleFormat() );
+	dstFrame.getBuffer().resize( src.getNbSamples() * dstSampleSize );
+	return true;
+}
+
 void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
 	if( ! _isInit )
 		_isInit = init( srcFrame, dstFrame );
 
+	if( srcFrame.getSize() != _previousProcessedAudioFrameSize )
+		initFrames( srcFrame, dstFrame );
+
 	const unsigned char* srcData = srcFrame.getPtr();
 	unsigned char* dstData = dstFrame.getPtr();
 
@@ -89,6 +103,7 @@ void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 	if( dstFrame.getSize() != nbOutputSamples )
 		dstFrame.getBuffer().resize( nbOutputSamples, 0 );
 	static_cast<AudioFrame&>( dstFrame ).setNbSamples( static_cast<const AudioFrame&>( srcFrame ).getNbSamples() );
+	_previousProcessedAudioFrameSize = srcFrame.getSize();
 }
 
 }
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -26,8 +26,11 @@ class AvExport AudioTransform : public ITransform
 
 private:
 	bool init( const Frame& srcFrame, const Frame& dstFrame );
+	bool initFrames( const Frame& srcFrame, Frame& dstFrame );
 	
 	ResampleContext* _audioConvertContext;
+	
+	size_t _previousProcessedAudioFrameSize;
 
 	bool _isInit;
 };

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ namespace avtranscoder`
`32`	`32`
`33`	`33`	`AudioTransform::AudioTransform()`
`34`	`34`	`: _audioConvertContext( NULL )`
	`35`	`+ , _previousProcessedAudioFrameSize( 0 )`
`35`	`36`	`, _isInit ( false )`
`36`	`37`	`{`
`37`	`38`	`}`
`@@ -64,11 +65,24 @@ bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`64`	`65`	`return true;`
`65`	`66`	`}`
`66`	`67`
	`68`	`+bool AudioTransform::initFrames( const Frame& srcFrame, Frame& dstFrame )`
	`69`	`+{`
	`70`	`+ const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );`
	`71`	`+ const AudioFrame& dst = static_cast<const AudioFrame&>( dstFrame );`
	`72`	`+`
	`73`	`+ int dstSampleSize = av_get_bytes_per_sample( dst.desc().getAVSampleFormat() );`
	`74`	`+ dstFrame.getBuffer().resize( src.getNbSamples() * dstSampleSize );`
	`75`	`+ return true;`
	`76`	`+}`
	`77`	`+`
`67`	`78`	`void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`68`	`79`	`{`
`69`	`80`	`if( ! _isInit )`
`70`	`81`	`_isInit = init( srcFrame, dstFrame );`
`71`	`82`
	`83`	`+ if( srcFrame.getSize() != _previousProcessedAudioFrameSize )`
	`84`	`+ initFrames( srcFrame, dstFrame );`
	`85`	`+`
`72`	`86`	`const unsigned char* srcData = srcFrame.getPtr();`
`73`	`87`	`unsigned char* dstData = dstFrame.getPtr();`
`74`	`88`
`@@ -89,6 +103,7 @@ void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`89`	`103`	`if( dstFrame.getSize() != nbOutputSamples )`
`90`	`104`	`dstFrame.getBuffer().resize( nbOutputSamples, 0 );`
`91`	`105`	`static_cast<AudioFrame&>( dstFrame ).setNbSamples( static_cast<const AudioFrame&>( srcFrame ).getNbSamples() );`
	`106`	`+ _previousProcessedAudioFrameSize = srcFrame.getSize();`
`92`	`107`	`}`
`93`	`108`
`94`	`109`	`}`