Rename GeneratorVideo/Audio to Video/AudioGenerator

Clement Champetier · Clement Champetier · commit 7674f90e3671 · 2015-01-12T18:05:52.000+01:00
Fit to pattern of name of other objects.
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -33,8 +33,8 @@
 #include <AvTranscoder/essenceStream/IDecoder.hpp>
 #include <AvTranscoder/essenceStream/AudioDecoder.hpp>
 #include <AvTranscoder/essenceStream/VideoDecoder.hpp>
-#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
-#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
+#include <AvTranscoder/essenceStream/VideoGenerator.hpp>
+#include <AvTranscoder/essenceStream/AudioGenerator.hpp>
 
 #include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
@@ -71,8 +71,8 @@ namespace std {
 %include <AvTranscoder/essenceStream/IDecoder.hpp>
 %include <AvTranscoder/essenceStream/AudioDecoder.hpp>
 %include <AvTranscoder/essenceStream/VideoDecoder.hpp>
-%include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
-%include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
+%include <AvTranscoder/essenceStream/VideoGenerator.hpp>
+%include <AvTranscoder/essenceStream/AudioGenerator.hpp>
 
 %include "AvTranscoder/file/file.i"
 
diff --git a/src/AvTranscoder/essenceStream/AudioGenerator.cpp b/src/AvTranscoder/essenceStream/AudioGenerator.cpp
@@ -1,26 +1,26 @@
-#include "GeneratorAudio.hpp"
+#include "AudioGenerator.hpp"
 
 namespace avtranscoder
 {
 
-GeneratorAudio::GeneratorAudio( )
+AudioGenerator::AudioGenerator()
 	: _inputFrame( NULL )
 	, _frameDesc()
 {
 }
 
-void GeneratorAudio::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
+void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
 {
 	_frameDesc = frameDesc;
 	_frameDesc.setFps( 25. );
 }
 
-void GeneratorAudio::setFrame( Frame& inputFrame )
+void AudioGenerator::setFrame( Frame& inputFrame )
 {
 	_inputFrame = &inputFrame;
 }
 
-bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer )
+bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )
 {
 	if( ! _inputFrame )
 	{
@@ -44,7 +44,7 @@ bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool AudioGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
 	return false;
 }
diff --git a/src/AvTranscoder/essenceStream/AudioGenerator.hpp b/src/AvTranscoder/essenceStream/AudioGenerator.hpp
@@ -7,10 +7,10 @@
 namespace avtranscoder
 {
 
-class AvExport GeneratorAudio : public IDecoder
+class AvExport AudioGenerator : public IDecoder
 {
 public:
-	GeneratorAudio( );
+	AudioGenerator();
 
 	AudioFrameDesc& getAudioFrameDesc() { return _frameDesc; }
 	void setAudioFrameDesc( const AudioFrameDesc& frameDesc );
diff --git a/src/AvTranscoder/essenceStream/VideoGenerator.cpp b/src/AvTranscoder/essenceStream/VideoGenerator.cpp
@@ -1,27 +1,27 @@
-#include "GeneratorVideo.hpp"
+#include "VideoGenerator.hpp"
 
 #include <AvTranscoder/transform/VideoTransform.hpp>
 
 namespace avtranscoder
 {
 
-GeneratorVideo::GeneratorVideo( )
+VideoGenerator::VideoGenerator()
 	: _inputFrame( NULL )
 	, _frameDesc()
 {
 }
 
-void GeneratorVideo::setVideoFrameDesc( const VideoFrameDesc& frameDesc )
+void VideoGenerator::setVideoFrameDesc( const VideoFrameDesc& frameDesc )
 {
 	_frameDesc = frameDesc;
 }
 
-void GeneratorVideo::setNextFrame( Frame& inputFrame )
+void VideoGenerator::setNextFrame( Frame& inputFrame )
 {
 	_inputFrame = &inputFrame;
 }
 
-bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer )
+bool VideoGenerator::decodeNextFrame( Frame& frameBuffer )
 {
 	// Generate black image
 	if( ! _inputFrame )
@@ -47,7 +47,7 @@ bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool VideoGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
 	return false;
 }
diff --git a/src/AvTranscoder/essenceStream/VideoGenerator.hpp b/src/AvTranscoder/essenceStream/VideoGenerator.hpp
@@ -7,10 +7,10 @@
 namespace avtranscoder
 {
 
-class AvExport GeneratorVideo : public IDecoder
+class AvExport VideoGenerator : public IDecoder
 {
 public:
-	GeneratorVideo();
+	VideoGenerator();
 
 	VideoFrameDesc& getVideoFrameDesc() { return _frameDesc; }
 	void setVideoFrameDesc( const VideoFrameDesc& frameDesc );
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -7,8 +7,8 @@
 #include <AvTranscoder/essenceStream/AudioDecoder.hpp>
 #include <AvTranscoder/essenceStream/VideoEncoder.hpp>
 #include <AvTranscoder/essenceStream/AudioEncoder.hpp>
-#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
-#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
+#include <AvTranscoder/essenceStream/VideoGenerator.hpp>
+#include <AvTranscoder/essenceStream/AudioGenerator.hpp>
 
 #include <AvTranscoder/transform/AudioTransform.hpp>
 #include <AvTranscoder/transform/VideoTransform.hpp>
@@ -111,7 +111,7 @@ StreamTranscoder::StreamTranscoder(
 			
 			_transform = new VideoTransform();
 
-			GeneratorVideo* generatorVideo = new GeneratorVideo();
+			VideoGenerator* generatorVideo = new VideoGenerator();
 			generatorVideo->setVideoFrameDesc( outputVideo->getVideoCodec().getVideoFrameDesc() );
 			_generator = generatorVideo;
 			
@@ -146,7 +146,7 @@ StreamTranscoder::StreamTranscoder(
 			
 			_transform = new AudioTransform();
 
-			GeneratorAudio* generatorAudio = new GeneratorAudio();
+			AudioGenerator* generatorAudio = new AudioGenerator();
 			generatorAudio->setAudioFrameDesc( outputAudio->getAudioCodec().getAudioFrameDesc() );
 			_generator = generatorAudio;
 
@@ -190,7 +190,7 @@ StreamTranscoder::StreamTranscoder(
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
 		// Create input essence based on a given input VideoCodec
-		GeneratorVideo* generatorVideo = new GeneratorVideo();
+		VideoGenerator* generatorVideo = new VideoGenerator();
 		const VideoCodec& inputVideoCodec = static_cast<const VideoCodec&>( inputCodec );
 		generatorVideo->setVideoFrameDesc( inputVideoCodec.getVideoFrameDesc() );
 		_inputDecoder = generatorVideo;
@@ -217,7 +217,7 @@ StreamTranscoder::StreamTranscoder(
 	else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 	{
 		// Create input essence based on a given input AudioCodec
-		GeneratorAudio* generatorAudio = new GeneratorAudio();
+		AudioGenerator* generatorAudio = new AudioGenerator();
 		const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>( inputCodec );
 		generatorAudio->setAudioFrameDesc( inputAudioCodec.getAudioFrameDesc() );
 		_inputDecoder = generatorAudio;
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -8,8 +8,8 @@
 
 #include <AvTranscoder/codedStream/IInputStream.hpp>
 
-#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
-#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+#include <AvTranscoder/essenceStream/AudioGenerator.hpp>
+#include <AvTranscoder/essenceStream/VideoGenerator.hpp>
 
 #include <AvTranscoder/ProfileLoader.hpp>
 

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,26 @@`
`1`		`-#include "GeneratorAudio.hpp"`
	`1`	`+#include "AudioGenerator.hpp"`
`2`	`2`
`3`	`3`	`namespace avtranscoder`
`4`	`4`	`{`
`5`	`5`
`6`		`-GeneratorAudio::GeneratorAudio( )`
	`6`	`+AudioGenerator::AudioGenerator()`
`7`	`7`	`: _inputFrame( NULL )`
`8`	`8`	`, _frameDesc()`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`		`-void GeneratorAudio::setAudioFrameDesc( const AudioFrameDesc& frameDesc )`
	`12`	`+void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )`
`13`	`13`	`{`
`14`	`14`	`_frameDesc = frameDesc;`
`15`	`15`	`_frameDesc.setFps( 25. );`
`16`	`16`	`}`
`17`	`17`
`18`		`-void GeneratorAudio::setFrame( Frame& inputFrame )`
	`18`	`+void AudioGenerator::setFrame( Frame& inputFrame )`
`19`	`19`	`{`
`20`	`20`	`_inputFrame = &inputFrame;`
`21`	`21`	`}`
`22`	`22`
`23`		`-bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer )`
	`23`	`+bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )`
`24`	`24`	`{`
`25`	`25`	`if( ! _inputFrame )`
`26`	`26`	`{`
`@@ -44,7 +44,7 @@ bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer )`
`44`	`44`	`return true;`
`45`	`45`	`}`
`46`	`46`
`47`		`-bool GeneratorAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`47`	`+bool AudioGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`48`	`48`	`{`
`49`	`49`	`return false;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-class AvExport GeneratorAudio : public IDecoder`
	`10`	`+class AvExport AudioGenerator : public IDecoder`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`		`- GeneratorAudio( );`
	`13`	`+ AudioGenerator();`
`14`	`14`
`15`	`15`	`AudioFrameDesc& getAudioFrameDesc() { return _frameDesc; }`
`16`	`16`	`void setAudioFrameDesc( const AudioFrameDesc& frameDesc );`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,27 @@`
`1`		`-#include "GeneratorVideo.hpp"`
	`1`	`+#include "VideoGenerator.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/transform/VideoTransform.hpp>`
`4`	`4`
`5`	`5`	`namespace avtranscoder`
`6`	`6`	`{`
`7`	`7`
`8`		`-GeneratorVideo::GeneratorVideo( )`
	`8`	`+VideoGenerator::VideoGenerator()`
`9`	`9`	`: _inputFrame( NULL )`
`10`	`10`	`, _frameDesc()`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`-void GeneratorVideo::setVideoFrameDesc( const VideoFrameDesc& frameDesc )`
	`14`	`+void VideoGenerator::setVideoFrameDesc( const VideoFrameDesc& frameDesc )`
`15`	`15`	`{`
`16`	`16`	`_frameDesc = frameDesc;`
`17`	`17`	`}`
`18`	`18`
`19`		`-void GeneratorVideo::setNextFrame( Frame& inputFrame )`
	`19`	`+void VideoGenerator::setNextFrame( Frame& inputFrame )`
`20`	`20`	`{`
`21`	`21`	`_inputFrame = &inputFrame;`
`22`	`22`	`}`
`23`	`23`
`24`		`-bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer )`
	`24`	`+bool VideoGenerator::decodeNextFrame( Frame& frameBuffer )`
`25`	`25`	`{`
`26`	`26`	`// Generate black image`
`27`	`27`	`if( ! _inputFrame )`
`@@ -47,7 +47,7 @@ bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer )`
`47`	`47`	`return true;`
`48`	`48`	`}`
`49`	`49`
`50`		`-bool GeneratorVideo::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`50`	`+bool VideoGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`51`	`51`	`{`
`52`	`52`	`return false;`
`53`	`53`	`}`