fix data size into frame to use dummy stream correctly

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 194a95c5036a · 2014-07-02T08:14:39.000-04:00
diff --git a/src/AvTranscoder/EssenceStream/DummyAudio.cpp b/src/AvTranscoder/EssenceStream/DummyAudio.cpp
@@ -33,6 +33,9 @@ bool DummyAudio::readNextFrame( Frame& frameBuffer )
 {
 	frameBuffer.getBuffer().resize( _frameDesc.getDataSize() );
 
+	AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );
+	audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );
+
 	//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );
 	int fill_char = (
 		_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8 ||
@@ -59,6 +62,8 @@ bool DummyAudio::readNextFrame( std::vector<Frame>& frameBuffer )
 
 	for( size_t channel = 0; channel < _frameDesc.getChannels(); ++channel )
 	{
+		AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer.at( channel ) );
+		audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );
 		frameBuffer.at( channel).getBuffer().resize( dataSizeOneChannel );
 		memset( frameBuffer.at( channel).getPtr(), fill_char, frameBuffer.at( channel).getSize() );
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ bool DummyAudio::readNextFrame( Frame& frameBuffer )`
`33`	`33`	`{`
`34`	`34`	`frameBuffer.getBuffer().resize( _frameDesc.getDataSize() );`
`35`	`35`
	`36`	`+ AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );`
	`37`	`+ audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );`
	`38`	`+`
`36`	`39`	`//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );`
`37`	`40`	`int fill_char = (`
`38`	`41`	`_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8 \|\|`
`@@ -59,6 +62,8 @@ bool DummyAudio::readNextFrame( std::vector<Frame>& frameBuffer )`
`59`	`62`
`60`	`63`	`for( size_t channel = 0; channel < _frameDesc.getChannels(); ++channel )`
`61`	`64`	`{`
	`65`	`+ AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer.at( channel ) );`
	`66`	`+ audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );`
`62`	`67`	`frameBuffer.at( channel).getBuffer().resize( dataSizeOneChannel );`
`63`	`68`	`memset( frameBuffer.at( channel).getPtr(), fill_char, frameBuffer.at( channel).getSize() );`
`64`	`69`	`}`