EssenceTransform: rename folder/files/classes whithout 'essence'

Clement Champetier · Clement Champetier · commit 0af9547ff4d7 · 2014-10-06T14:14:40.000+02:00
* Rename folder 'essenceTransform' to 'transform'.
* Rename files to ITransform, VideoTransform and AudioTransform.
* Rename classes to ITransform, VideoTransform and AudioTransform.
* No sense to have transforms for coded data. So transforms are
implicitly for essence (decoded) data.
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -8,7 +8,7 @@
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 #include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
 
@@ -53,7 +53,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	of.beginWrap();
 
-	VideoEssenceTransform ct;
+	VideoTransform ct;
 
 
 	// Encodage/transcodage
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -4,7 +4,7 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 #include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
 
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
@@ -80,7 +80,7 @@ class AvReader : public Reader
 	{
 		++_currentFrame;
 		_inputVideo->readNextFrame( *_sourceImage );
-		_videoEssenceTransform.convert( *_sourceImage, *_imageToDisplay );
+		_videoTransform.convert( *_sourceImage, *_imageToDisplay );
 		return (const char*)_imageToDisplay->getPtr();
 	}
 
@@ -114,7 +114,7 @@ class AvReader : public Reader
 	avtranscoder::Pixel          _pixel;
 	avtranscoder::VideoFrameDesc _videoFrameDescToDisplay;
 
-	avtranscoder::VideoEssenceTransform _videoEssenceTransform;
+	avtranscoder::VideoTransform _videoTransform;
 	size_t _videoStream;
 };
 
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -1,6 +1,6 @@
 #include "GeneratorVideo.hpp"
 
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 namespace avtranscoder
 {
@@ -54,7 +54,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 		intermediateBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
 		memset( intermediateBuffer.getPtr(), fillChar, _videoFrameDesc.getDataSize() );
 
-		VideoEssenceTransform videoEssenceTransform;
+		VideoTransform videoEssenceTransform;
 		videoEssenceTransform.convert( intermediateBuffer, frameBuffer );
 
 		return true;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -10,8 +10,8 @@
 #include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
 #include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
-#include <AvTranscoder/essenceTransform/AudioEssenceTransform.hpp>
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+#include <AvTranscoder/transform/AudioTransform.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 #include <cassert>
 #include <iostream>
@@ -109,7 +109,7 @@ StreamTranscoder::StreamTranscoder(
 			_sourceBuffer = new VideoFrame( _inputStream->getVideoCodec().getVideoFrameDesc() );
 			_frameBuffer = new VideoFrame( outputVideo->getVideoCodec().getVideoFrameDesc() );
 			
-			_transform = new VideoEssenceTransform();
+			_transform = new VideoTransform();
 
 			GeneratorVideo* generatorVideo = new GeneratorVideo();
 			generatorVideo->setVideoDesc( outputVideo->getVideoCodec() );
@@ -144,7 +144,7 @@ StreamTranscoder::StreamTranscoder(
 			_sourceBuffer = new AudioFrame( inputFrameDesc );
 			_frameBuffer  = new AudioFrame( outputAudio->getAudioCodec().getFrameDesc() );
 			
-			_transform = new AudioEssenceTransform();
+			_transform = new AudioTransform();
 
 			GeneratorAudio* generatorAudio = new GeneratorAudio();
 			generatorAudio->setAudioDesc( outputAudio->getAudioCodec() );
@@ -203,7 +203,7 @@ StreamTranscoder::StreamTranscoder(
 		_sourceBuffer = new VideoFrame( inputFrameDesc );
 		_frameBuffer  = new VideoFrame( outputFrameDesc );
 
-		_transform = new VideoEssenceTransform();
+		_transform = new VideoTransform();
 
 		_currentEssence = _inputEssence;		
 
@@ -226,7 +226,7 @@ StreamTranscoder::StreamTranscoder(
 		_sourceBuffer = new AudioFrame( inputFrameDesc );
 		_frameBuffer  = new AudioFrame( outputFrameDesc );
 
-		_transform = new AudioEssenceTransform();
+		_transform = new AudioTransform();
 		
 		_currentEssence = _inputEssence;
 		return;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -15,7 +15,7 @@
 namespace avtranscoder
 {
 
-class IEssenceTransform;
+class ITransform;
 
 class StreamTranscoder
 {
@@ -86,7 +86,7 @@ class StreamTranscoder
 	IInputEssence*  _currentEssence;
 	IOutputEssence* _outputEssence;
 
-	IEssenceTransform* _transform;
+	ITransform* _transform;
 
 	int  _subStreamIndex;
 
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -1,4 +1,4 @@
-#include "AudioEssenceTransform.hpp"
+#include "AudioTransform.hpp"
 
 #include <stdexcept>
 
@@ -33,13 +33,13 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioEssenceTransform::AudioEssenceTransform()
+AudioTransform::AudioTransform()
 	: _audioConvertContext( NULL )
 	, _isInit    ( false )
 {
 }
 
-bool AudioEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
+bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 {
 	const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );
 	const AudioFrame& dst = static_cast<const AudioFrame&>( dstFrame );
@@ -67,7 +67,7 @@ bool AudioEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	return true;
 }
 
-void AudioEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
+void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
 	if( ! _isInit )
 		_isInit = init( srcFrame, dstFrame );
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
 
-#include "IEssenceTransform.hpp"
+#include "ITransform.hpp"
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/essenceStructures/Frame.hpp>
@@ -17,10 +17,10 @@ class ResampleContext;
 namespace avtranscoder
 {
 
-class AvExport AudioEssenceTransform : public IEssenceTransform
+class AvExport AudioTransform : public ITransform
 {
 public:
-	AudioEssenceTransform();
+	AudioTransform();
 
 	void convert( const Frame& srcFrame, Frame& dstFrame );
 
diff --git a/src/AvTranscoder/transform/ITransform.hpp b/src/AvTranscoder/transform/ITransform.hpp
@@ -7,13 +7,13 @@
 namespace avtranscoder
 {
 
-class AvExport IEssenceTransform
+class AvExport ITransform
 {
 public:
-	IEssenceTransform()
+	ITransform()
 	{}
 
-	virtual ~IEssenceTransform()
+	virtual ~ITransform()
 	{}
 
 	virtual void convert( const Frame& src, Frame& dst ) = 0;
diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -1,4 +1,4 @@
-#include "VideoEssenceTransform.hpp"
+#include "VideoTransform.hpp"
 
 #include <AvTranscoder/essenceStructures/Pixel.hpp>
 #include <AvTranscoder/essenceStructures/VideoFrame.hpp>
@@ -25,7 +25,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-VideoEssenceTransform::VideoEssenceTransform()
+VideoTransform::VideoTransform()
 	: _imageConvertContext( NULL )
 	, _srcData     ( (uint8_t)MAX_SWS_PLANE, NULL )
 	, _dstData     ( (uint8_t)MAX_SWS_PLANE, NULL )
@@ -38,7 +38,7 @@ VideoEssenceTransform::VideoEssenceTransform()
 {
 }
 
-bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
+bool VideoTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 {
 	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
 	const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );
@@ -111,7 +111,7 @@ bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	return true;
 }
 
-void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
+void VideoTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
 	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
 	VideoFrame& dst = static_cast<VideoFrame&>( dstFrame );
diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "IEssenceTransform.hpp"
+#include "ITransform.hpp"
 
 #include <AvTranscoder/essenceStructures/Frame.hpp>
 
@@ -12,10 +12,10 @@ class SwsContext;
 namespace avtranscoder
 {
 
-class AvExport VideoEssenceTransform : public IEssenceTransform
+class AvExport VideoTransform : public ITransform
 {
 public:
-	VideoEssenceTransform();
+	VideoTransform();
 
 	void convert( const Frame& srcFrame, Frame& dstFrame );
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`namespace avtranscoder`
`16`	`16`	`{`
`17`	`17`
`18`		`-class IEssenceTransform;`
	`18`	`+class ITransform;`
`19`	`19`
`20`	`20`	`class StreamTranscoder`
`21`	`21`	`{`
`@@ -86,7 +86,7 @@ class StreamTranscoder`
`86`	`86`	`IInputEssence* _currentEssence;`
`87`	`87`	`IOutputEssence* _outputEssence;`
`88`	`88`
`89`		`- IEssenceTransform* _transform;`
	`89`	`+ ITransform* _transform;`
`90`	`90`
`91`	`91`	`int _subStreamIndex;`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "AudioEssenceTransform.hpp"`
	`1`	`+#include "AudioTransform.hpp"`
`2`	`2`
`3`	`3`	`#include <stdexcept>`
`4`	`4`
`@@ -33,13 +33,13 @@ extern "C" {`
`33`	`33`	`namespace avtranscoder`
`34`	`34`	`{`
`35`	`35`
`36`		`-AudioEssenceTransform::AudioEssenceTransform()`
	`36`	`+AudioTransform::AudioTransform()`
`37`	`37`	`: _audioConvertContext( NULL )`
`38`	`38`	`, _isInit ( false )`
`39`	`39`	`{`
`40`	`40`	`}`
`41`	`41`
`42`		`-bool AudioEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
	`42`	`+bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`43`	`43`	`{`
`44`	`44`	`const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );`
`45`	`45`	`const AudioFrame& dst = static_cast<const AudioFrame&>( dstFrame );`
`@@ -67,7 +67,7 @@ bool AudioEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`67`	`67`	`return true;`
`68`	`68`	`}`
`69`	`69`
`70`		`-void AudioEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
	`70`	`+void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`71`	`71`	`{`
`72`	`72`	`if( ! _isInit )`
`73`	`73`	`_isInit = init( srcFrame, dstFrame );`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-class AvExport IEssenceTransform`
	`10`	`+class AvExport ITransform`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`		`- IEssenceTransform()`
	`13`	`+ ITransform()`
`14`	`14`	`{}`
`15`	`15`
`16`		`- virtual ~IEssenceTransform()`
	`16`	`+ virtual ~ITransform()`
`17`	`17`	`{}`
`18`	`18`
`19`	`19`	`virtual void convert( const Frame& src, Frame& dst ) = 0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "VideoEssenceTransform.hpp"`
	`1`	`+#include "VideoTransform.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/essenceStructures/Pixel.hpp>`
`4`	`4`	`#include <AvTranscoder/essenceStructures/VideoFrame.hpp>`
`@@ -25,7 +25,7 @@ extern "C" {`
`25`	`25`	`namespace avtranscoder`
`26`	`26`	`{`
`27`	`27`
`28`		`-VideoEssenceTransform::VideoEssenceTransform()`
	`28`	`+VideoTransform::VideoTransform()`
`29`	`29`	`: _imageConvertContext( NULL )`
`30`	`30`	`, _srcData ( (uint8_t)MAX_SWS_PLANE, NULL )`
`31`	`31`	`, _dstData ( (uint8_t)MAX_SWS_PLANE, NULL )`
`@@ -38,7 +38,7 @@ VideoEssenceTransform::VideoEssenceTransform()`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`-bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
	`41`	`+bool VideoTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`42`	`42`	`{`
`43`	`43`	`const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );`
`44`	`44`	`const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );`
`@@ -111,7 +111,7 @@ bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`111`	`111`	`return true;`
`112`	`112`	`}`
`113`	`113`
`114`		`-void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
	`114`	`+void VideoTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`115`	`115`	`{`
`116`	`116`	`const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );`
`117`	`117`	`VideoFrame& dst = static_cast<VideoFrame&>( dstFrame );`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <vector>`
`5`	`5`
`6`		`-#include "IEssenceTransform.hpp"`
	`6`	`+#include "ITransform.hpp"`
`7`	`7`
`8`	`8`	`#include <AvTranscoder/essenceStructures/Frame.hpp>`
`9`	`9`
`@@ -12,10 +12,10 @@ class SwsContext;`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-class AvExport VideoEssenceTransform : public IEssenceTransform`
	`15`	`+class AvExport VideoTransform : public ITransform`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`		`- VideoEssenceTransform();`
	`18`	`+ VideoTransform();`
`19`	`19`
`20`	`20`	`void convert( const Frame& srcFrame, Frame& dstFrame );`
`21`	`21`