Skip to content

Commit 7293763

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
rename Transformers as EssenceTransform
1 parent 290cc4f commit 7293763

File tree

9 files changed

+32
-36
lines changed

9 files changed

+32
-36
lines changed

‎app/audioRewrapper/audioRewrapper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <AvTranscoder/InputStreamAudio.hpp>
99
#include <AvTranscoder/OutputStreamAudio.hpp>
1010

11-
#include <AvTranscoder/AudioTransform.hpp>
11+
#include <AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp>
1212

1313
void rewrapAudio( const char* inputfilename, const char* outputFilename )
1414
{
@@ -92,7 +92,7 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )
9292
outputFile.beginWrap();
9393

9494
// init convert
95-
AudioTransform audioTransform;
95+
AudioEssenceTransform audioEssenceTransform;
9696

9797
DataStream codedFrame;
9898

@@ -107,7 +107,7 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )
107107
{
108108
std::cout << "\rprocess frame " << (int)frame - 1 << std::flush;
109109

110-
audioTransform.convert( audioFrameSource, audioFrameToEncode );
110+
audioEssenceTransform.convert( audioFrameSource, audioFrameToEncode );
111111

112112
outputStreamAudio.encodeFrame( audioFrameToEncode, codedFrame );
113113

‎app/avTranscoder/avTranscoder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <AvTranscoder/File/InputFile.hpp>
1313
#include <AvTranscoder/File/OutputFile.hpp>
1414

15-
#include <AvTranscoder/ColorTransform.hpp>
15+
#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
1616

1717
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
1818
#include <AvTranscoder/DatasStructures/Image.hpp>
@@ -56,7 +56,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
5656

5757
of.beginWrap();
5858

59-
ColorTransform ct;
59+
VideoEssenceTransform ct;
6060

6161

6262
// Encodage/transcodage

‎app/avplay/AvReader.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <AvTranscoder/InputStreamVideo.hpp>
88
#include <AvTranscoder/File/InputFile.hpp>
99

10-
#include <AvTranscoder/ColorTransform.hpp>
10+
#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
1111

1212
#include <AvTranscoder/Metadatas/Print.hpp>
1313

@@ -80,7 +80,7 @@ class AvReader : public Reader
8080
{
8181
++currentFrame;
8282
m_inputStreamVideo->readNextFrame( *m_sourceImage );
83-
m_colorTransform.convert( *m_sourceImage, *m_imageToDisplay );
83+
m_videoEssenceTransform.convert( *m_sourceImage, *m_imageToDisplay );
8484
return (const char*)m_imageToDisplay->getPtr();
8585
}
8686

@@ -114,7 +114,7 @@ class AvReader : public Reader
114114
avtranscoder::Pixel pixel;
115115
avtranscoder::ImageDesc imageDescToDisplay;
116116

117-
avtranscoder::ColorTransform m_colorTransform;
117+
avtranscoder::VideoEssenceTransform m_videoEssenceTransform;
118118
size_t m_videoStream;
119119
};
120120

‎src/AvTranscoder/AudioTransform.cpp renamed to ‎src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "AudioTransform.hpp"
2-
#include "DatasStructures/AudioFrame.hpp"
3-
#include "common.hpp"
1+
#include "AudioEssenceTransform.hpp"
2+
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
3+
#include <AvTranscoder/common.hpp>
44

55
extern "C" {
66
#ifndef __STDC_CONSTANT_MACROS
@@ -33,13 +33,13 @@ extern "C" {
3333
namespace avtranscoder
3434
{
3535

36-
AudioTransform::AudioTransform()
36+
AudioEssenceTransform::AudioEssenceTransform()
3737
: _audioConvertContext( NULL )
3838
, _isInit ( false )
3939
{
4040
}
4141

42-
bool AudioTransform::init( const AudioFrame& src, const AudioFrame& dst )
42+
bool AudioEssenceTransform::init( const AudioFrame& src, const AudioFrame& dst )
4343
{
4444
_audioConvertContext = AllocResampleContext();
4545

@@ -64,7 +64,7 @@ bool AudioTransform::init( const AudioFrame& src, const AudioFrame& dst )
6464
return true;
6565
}
6666

67-
void AudioTransform::convert( const AudioFrame& src, AudioFrame& dst )
67+
void AudioEssenceTransform::convert( const AudioFrame& src, AudioFrame& dst )
6868
{
6969
if( ! _isInit )
7070
{

‎src/AvTranscoder/AudioTransform.hpp renamed to ‎src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#ifndef _AV_TRANSCODER_AUDIO_TRANSFORM_HPP
2-
#define _AV_TRANSCODER_AUDIO_TRANSFORM_HPP
1+
#ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
2+
#define _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
33

4-
#include "common.hpp"
4+
#include <AvTranscoder/common.hpp>
55

66
#ifdef AV_RESAMPLE_LIBRARY
77
#define ResampleContext AVAudioResampleContext
@@ -16,10 +16,10 @@ namespace avtranscoder
1616

1717
class AudioFrame;
1818

19-
class AvExport AudioTransform
19+
class AvExport AudioEssenceTransform
2020
{
2121
public:
22-
AudioTransform();
22+
AudioEssenceTransform();
2323

2424
void convert( const AudioFrame& src, AudioFrame& dst );
2525

‎src/AvTranscoder/ColorTransform.cpp renamed to ‎src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "ColorTransform.hpp"
2-
#include "common.hpp"
1+
#include "VideoEssenceTransform.hpp"
2+
#include <AvTranscoder/common.hpp>
33

44
extern "C" {
55
#ifndef __STDC_CONSTANT_MACROS
@@ -22,7 +22,7 @@ extern "C" {
2222
namespace avtranscoder
2323
{
2424

25-
ColorTransform::ColorTransform()
25+
VideoEssenceTransform::VideoEssenceTransform()
2626
: _imageConvertContext( NULL )
2727
, _srcData ( (uint8_t)MAX_SWS_PLANE, NULL )
2828
, _dstData ( (uint8_t)MAX_SWS_PLANE, NULL )
@@ -34,7 +34,7 @@ ColorTransform::ColorTransform()
3434
{
3535
}
3636

37-
bool ColorTransform::init( const Image& src, const Image& dst )
37+
bool VideoEssenceTransform::init( const Image& src, const Image& dst )
3838
{
3939
assert( src.desc().getWidth() != 0 );
4040
assert( src.desc().getHeight() != 0 );
@@ -76,7 +76,7 @@ bool ColorTransform::init( const Image& src, const Image& dst )
7676
return true;
7777
}
7878

79-
void ColorTransform::convert( const Image& src, Image& dst )
79+
void VideoEssenceTransform::convert( const Image& src, Image& dst )
8080
{
8181
assert( src.desc().getWidth() != 0 );
8282
assert( src.desc().getHeight() != 0 );

‎src/AvTranscoder/ColorTransform.hpp renamed to ‎src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#ifndef _AV_TRANSCODER_COLOR_TRANSFORM_HPP_
2-
#define _AV_TRANSCODER_COLOR_TRANSFORM_HPP_
1+
#ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
2+
#define _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
33

4-
#include "DatasStructures/Pixel.hpp"
5-
#include "DatasStructures/Image.hpp"
4+
#include <AvTranscoder/DatasStructures/Pixel.hpp>
5+
#include <AvTranscoder/DatasStructures/Image.hpp>
66

77
#include <vector>
88
#include <string>
@@ -12,10 +12,10 @@ class SwsContext;
1212
namespace avtranscoder
1313
{
1414

15-
class AvExport ColorTransform
15+
class AvExport VideoEssenceTransform
1616
{
1717
public:
18-
ColorTransform();
18+
VideoEssenceTransform();
1919

2020
void convert( const Image& src, Image& dst );
2121

‎src/AvTranscoder/Metadatas/Print.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include <AvTranscoder/File/InputFile.hpp>
1313
#include <AvTranscoder/File/OutputFile.hpp>
1414

15-
#include <AvTranscoder/ColorTransform.hpp>
16-
1715
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
1816
#include <AvTranscoder/DatasStructures/Image.hpp>
1917

‎src/SConscript

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ env.Append(
1616
sAvTranscoder = env.StaticLibrary(
1717
'sAvTranscoder',
1818
Glob( 'AvTranscoder/*.cpp' ) +
19-
Glob( 'AvTranscoder/DatasStructures/*.cpp' ) +
20-
Glob( 'AvTranscoder/File/*.cpp' ),
19+
Glob( 'AvTranscoder/*/*.cpp' ),
2120
LIBS = [
2221
'avutil',
2322
'avcodec',
@@ -30,8 +29,7 @@ sAvTranscoder = env.StaticLibrary(
3029
SharedAvTranscoder = env.SharedLibrary(
3130
'AvTranscoder',
3231
Glob( 'AvTranscoder/*.cpp' ) +
33-
Glob( 'AvTranscoder/DatasStructures/*.cpp' ) +
34-
Glob( 'AvTranscoder/File/*.cpp' ),
32+
Glob( 'AvTranscoder/*/*.cpp' ),
3533
LIBS = [
3634
'avutil',
3735
'avcodec',

0 commit comments

Comments
 (0)