Merge pull request #30 from cchampet/dev_DummyAudioSetFrame

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 792021a00c51 · 2014-07-22T12:12:07.000+02:00
DummyAudio: add setFrame
diff --git a/src/AvTranscoder/EssenceStream/DummyAudio.cpp b/src/AvTranscoder/EssenceStream/DummyAudio.cpp
@@ -5,6 +5,7 @@ namespace avtranscoder
 
 DummyAudio::DummyAudio( )
 	: InputEssence( )
+	, _inputFrame( NULL )
 {
 }
 
@@ -27,21 +28,33 @@ AudioDesc DummyAudio::getAudioDesc() const
 	return _audioDesc;
 }
 
+void DummyAudio::setFrame( Frame& inputFrame )
+{
+	_inputFrame = &inputFrame;
+}
+
 bool DummyAudio::readNextFrame( Frame& frameBuffer )
 {
 	frameBuffer.getBuffer().resize( _frameDesc.getDataSize() );
 
-	AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );
-	audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );
+	if( ! _inputFrame )
+	{
+		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 ||
-		_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8P
-		) ? 0x80 : 0x00;
-
-	memset( frameBuffer.getPtr(), fill_char, frameBuffer.getSize() );
+		//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );
+		int fill_char = (
+			_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8 ||
+			_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8P
+			) ? 0x80 : 0x00;
 
+		memset( frameBuffer.getPtr(), fill_char, frameBuffer.getSize() );
+		return true;
+	}
+	
+	if( frameBuffer.getSize() != _inputFrame->getSize() )
+		frameBuffer.getBuffer().resize( _inputFrame->getSize() );
+	std::memcpy( frameBuffer.getPtr(), _inputFrame->getPtr(), _inputFrame->getSize() );
 	return true;
 }
 
diff --git a/src/AvTranscoder/EssenceStream/DummyAudio.hpp b/src/AvTranscoder/EssenceStream/DummyAudio.hpp
@@ -23,13 +23,17 @@ class AvExport DummyAudio : public InputEssence
 	AudioDesc getAudioDesc() const;
 	
 	void setup() {}
+	
+	void setFrame( Frame& inputFrame );
 
 	bool readNextFrame( Frame& frameBuffer );
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
 	AudioDesc      _audioDesc;
 	AudioFrameDesc _frameDesc;
+	
+	Frame*    _inputFrame;
 };
 
 }
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -17,7 +17,7 @@ DummyVideo::~DummyVideo( )
 void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )
 {
 	_videoDesc = videoDesc;
-	_VideoFrameDesc = _videoDesc.getVideoFrameDesc();
+	_videoFrameDesc = _videoDesc.getVideoFrameDesc();
 }
 
 VideoDesc DummyVideo::getVideoDesc() const
@@ -32,7 +32,7 @@ void DummyVideo::setFrame( Frame& inputFrame )
 
 bool DummyVideo::readNextFrame( Frame& frameBuffer )
 {
-	frameBuffer.getBuffer().resize( _VideoFrameDesc.getDataSize() );
+	frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
 
 	if( ! _inputFrame )
 	{
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.hpp b/src/AvTranscoder/EssenceStream/DummyVideo.hpp
@@ -32,7 +32,7 @@ class AvExport DummyVideo : public InputEssence
 private:
 	Frame*    _inputFrame;
 	VideoDesc _videoDesc;
-	VideoFrameDesc _VideoFrameDesc;
+	VideoFrameDesc _videoFrameDesc;
 
 	size_t    _numberOfView;
 };

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ DummyVideo::~DummyVideo( )`
`17`	`17`	`void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )`
`18`	`18`	`{`
`19`	`19`	`_videoDesc = videoDesc;`
`20`		`- _VideoFrameDesc = _videoDesc.getVideoFrameDesc();`
	`20`	`+ _videoFrameDesc = _videoDesc.getVideoFrameDesc();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`VideoDesc DummyVideo::getVideoDesc() const`
`@@ -32,7 +32,7 @@ void DummyVideo::setFrame( Frame& inputFrame )`
`32`	`32`
`33`	`33`	`bool DummyVideo::readNextFrame( Frame& frameBuffer )`
`34`	`34`	`{`
`35`		`- frameBuffer.getBuffer().resize( _VideoFrameDesc.getDataSize() );`
	`35`	`+ frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
`36`	`36`
`37`	`37`	`if( ! _inputFrame )`
`38`	`38`	`{`