Skip to content

Commit be2de69

Browse files
author
Clement Champetier
committed
Rename DummyVideo / DummyAudio classes to GeneratorVideo / GeneratorAudio
* Also rename attributes and local variables about dummy: * Transcoder. * StreamTranscoder.
1 parent 791db60 commit be2de69

File tree

8 files changed

+84
-85
lines changed

8 files changed

+84
-85
lines changed

‎src/AvTranscoder/essenceStream/DummyAudio.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
namespace avtranscoder
44
{
55

6-
DummyAudio::DummyAudio( )
6+
GeneratorAudio::GeneratorAudio( )
77
: IInputEssence( )
88
, _inputFrame( NULL )
99
{
1010
}
1111

12-
DummyAudio::~DummyAudio( )
12+
GeneratorAudio::~GeneratorAudio( )
1313
{
1414
}
1515

16-
void DummyAudio::setAudioDesc( const AudioDesc& audioDesc )
16+
void GeneratorAudio::setAudioDesc( const AudioDesc& audioDesc )
1717
{
1818
_audioDesc = audioDesc;
1919

@@ -23,17 +23,17 @@ void DummyAudio::setAudioDesc( const AudioDesc& audioDesc )
2323
_frameDesc.setSampleFormat( _audioDesc.getCodecContext()->sample_fmt );
2424
}
2525

26-
AudioDesc DummyAudio::getAudioDesc() const
26+
AudioDesc GeneratorAudio::getAudioDesc() const
2727
{
2828
return _audioDesc;
2929
}
3030

31-
void DummyAudio::setFrame( Frame& inputFrame )
31+
void GeneratorAudio::setFrame( Frame& inputFrame )
3232
{
3333
_inputFrame = &inputFrame;
3434
}
3535

36-
bool DummyAudio::readNextFrame( Frame& frameBuffer )
36+
bool GeneratorAudio::readNextFrame( Frame& frameBuffer )
3737
{
3838
frameBuffer.getBuffer().resize( _frameDesc.getDataSize() );
3939

@@ -58,7 +58,7 @@ bool DummyAudio::readNextFrame( Frame& frameBuffer )
5858
return true;
5959
}
6060

61-
bool DummyAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
61+
bool GeneratorAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
6262
{
6363
return false;
6464
}

‎src/AvTranscoder/essenceStream/DummyAudio.hpp

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

44
#include "IInputEssence.hpp"
55

@@ -10,12 +10,12 @@
1010
namespace avtranscoder
1111
{
1212

13-
class AvExport DummyAudio : public IInputEssence
13+
class AvExport GeneratorAudio : public IInputEssence
1414
{
1515
public:
16-
DummyAudio( );
16+
GeneratorAudio( );
1717

18-
~DummyAudio( );
18+
~GeneratorAudio( );
1919

2020
// Stream properties
2121
void setAudioDesc( const AudioDesc& audioDesc );

‎src/AvTranscoder/essenceStream/DummyVideo.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace avtranscoder
66
{
77

8-
DummyVideo::DummyVideo( )
8+
GeneratorVideo::GeneratorVideo( )
99
: IInputEssence( )
1010
, _inputFrame( NULL )
1111
, _videoDesc()
@@ -14,27 +14,27 @@ DummyVideo::DummyVideo( )
1414
{
1515
}
1616

17-
DummyVideo::~DummyVideo( )
17+
GeneratorVideo::~GeneratorVideo( )
1818
{
1919
}
2020

21-
void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )
21+
void GeneratorVideo::setVideoDesc( const VideoDesc& videoDesc )
2222
{
2323
_videoDesc = videoDesc;
2424
_videoFrameDesc = _videoDesc.getVideoFrameDesc();
2525
}
2626

27-
VideoDesc DummyVideo::getVideoDesc() const
27+
VideoDesc GeneratorVideo::getVideoDesc() const
2828
{
2929
return _videoDesc;
3030
}
3131

32-
void DummyVideo::setFrame( Frame& inputFrame )
32+
void GeneratorVideo::setFrame( Frame& inputFrame )
3333
{
3434
_inputFrame = &inputFrame;
3535
}
3636

37-
bool DummyVideo::readNextFrame( Frame& frameBuffer )
37+
bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
3838
{
3939
if( ! _inputFrame )
4040
{
@@ -66,7 +66,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer )
6666
return true;
6767
}
6868

69-
bool DummyVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
69+
bool GeneratorVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
7070
{
7171
return false;
7272
}

‎src/AvTranscoder/essenceStream/DummyVideo.hpp

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

44
#include "IInputEssence.hpp"
55

@@ -10,12 +10,12 @@
1010
namespace avtranscoder
1111
{
1212

13-
class AvExport DummyVideo : public IInputEssence
13+
class AvExport GeneratorVideo : public IInputEssence
1414
{
1515
public:
16-
DummyVideo( );
16+
GeneratorVideo( );
1717

18-
~DummyVideo( );
18+
~GeneratorVideo( );
1919

2020
// Stream properties
2121
void setVideoDesc( const VideoDesc& videoDesc );

‎src/AvTranscoder/transcoder/StreamTranscoder.cpp

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ StreamTranscoder::StreamTranscoder(
2929
, _sourceBuffer( NULL )
3030
, _frameBuffer( NULL )
3131
, _inputEssence( NULL )
32-
, _dummyEssence( NULL )
32+
, _generatorEssence( NULL )
3333
, _currentEssence( NULL )
3434
, _outputEssence( NULL )
3535
, _transform( NULL )
3636
, _subStreamIndex( -1 )
3737
, _frameProcessed( 0 )
3838
, _offset( 0 )
39-
, _takeFromDummy( false )
39+
, _takeFromGenerator( false )
4040
, _verbose( false )
4141
, _offsetPassed( false )
4242
, _infinityStream( false )
@@ -76,14 +76,14 @@ StreamTranscoder::StreamTranscoder(
7676
, _sourceBuffer( NULL )
7777
, _frameBuffer( NULL )
7878
, _inputEssence( NULL )
79-
, _dummyEssence( NULL )
79+
, _generatorEssence( NULL )
8080
, _currentEssence( NULL )
8181
, _outputEssence( NULL )
8282
, _transform( NULL )
8383
, _subStreamIndex( subStreamIndex )
8484
, _frameProcessed( 0 )
8585
, _offset( offset )
86-
, _takeFromDummy( false )
86+
, _takeFromGenerator( false )
8787
, _verbose( false )
8888
, _offsetPassed( false )
8989
, _infinityStream( false )
@@ -111,9 +111,9 @@ StreamTranscoder::StreamTranscoder(
111111

112112
_transform = new VideoEssenceTransform();
113113

114-
DummyVideo* dummyVideo = new DummyVideo();
115-
dummyVideo->setVideoDesc( outputVideo->getVideoDesc() );
116-
_dummyEssence = dummyVideo;
114+
GeneratorVideo* generatorVideo = new GeneratorVideo();
115+
generatorVideo->setVideoDesc( outputVideo->getVideoDesc() );
116+
_generatorEssence = generatorVideo;
117117

118118
break;
119119
}
@@ -146,9 +146,9 @@ StreamTranscoder::StreamTranscoder(
146146

147147
_transform = new AudioEssenceTransform();
148148

149-
DummyAudio* dummyAudio = new DummyAudio();
150-
dummyAudio->setAudioDesc( outputAudio->getAudioDesc() );
151-
_dummyEssence = dummyAudio;
149+
GeneratorAudio* generatorAudio = new GeneratorAudio();
150+
generatorAudio->setAudioDesc( outputAudio->getAudioDesc() );
151+
_generatorEssence = generatorAudio;
152152

153153
break;
154154
}
@@ -171,19 +171,19 @@ StreamTranscoder::StreamTranscoder(
171171
, _sourceBuffer( NULL )
172172
, _frameBuffer( NULL )
173173
, _inputEssence( &inputEssence )
174-
, _dummyEssence( NULL )
174+
, _generatorEssence( NULL )
175175
, _currentEssence( NULL )
176176
, _outputEssence( NULL )
177177
, _transform( NULL )
178178
, _subStreamIndex( -1 )
179179
, _frameProcessed( 0 )
180180
, _offset( 0 )
181-
, _takeFromDummy( false )
181+
, _takeFromGenerator( false )
182182
, _verbose( false )
183183
, _offsetPassed( false )
184184
, _infinityStream( false )
185185
{
186-
// create a coding case based on a InputEssence (aka dummy reader)
186+
// create a coding case based on a InputEssence (aka generator)
187187
if( ! profile.count( Profile::avProfileType ) )
188188
throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
189189

@@ -193,7 +193,7 @@ StreamTranscoder::StreamTranscoder(
193193

194194
_outputEssence = outputVideo;
195195

196-
VideoFrameDesc inputFrameDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
196+
VideoFrameDesc inputFrameDesc = static_cast<GeneratorVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
197197

198198
VideoFrameDesc outputFrameDesc = inputFrameDesc;
199199
outputFrameDesc.setParameters( profile );
@@ -216,7 +216,7 @@ StreamTranscoder::StreamTranscoder(
216216

217217
_outputEssence = outputAudio;
218218

219-
AudioFrameDesc inputFrameDesc = static_cast<DummyAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
219+
AudioFrameDesc inputFrameDesc = static_cast<GeneratorAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
220220

221221
AudioFrameDesc outputFrameDesc = inputFrameDesc;
222222
outputFrameDesc.setParameters( profile );
@@ -243,8 +243,8 @@ StreamTranscoder::~StreamTranscoder()
243243
delete _sourceBuffer;
244244
if( _inputEssence && _inputStream )
245245
delete _inputEssence;
246-
if( _dummyEssence )
247-
delete _dummyEssence;
246+
if( _generatorEssence )
247+
delete _generatorEssence;
248248
if( _outputEssence )
249249
delete _outputEssence;
250250
if( _transform )
@@ -335,7 +335,7 @@ bool StreamTranscoder::processTranscode()
335335
if( _offset &&
336336
_frameProcessed > _offset &&
337337
! _offsetPassed &&
338-
_takeFromDummy )
338+
_takeFromGenerator )
339339
{
340340
switchToInputEssence();
341341
_offsetPassed = true;
@@ -358,7 +358,7 @@ bool StreamTranscoder::processTranscode()
358358
{
359359
if( _infinityStream )
360360
{
361-
switchToDummyEssence();
361+
switchToGeneratorEssence();
362362
return processTranscode();
363363
}
364364
return false;
@@ -387,7 +387,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
387387
if( _offset &&
388388
_frameProcessed > _offset &&
389389
! _offsetPassed &&
390-
_takeFromDummy )
390+
_takeFromGenerator )
391391
{
392392
switchToInputEssence();
393393
_offsetPassed = true;
@@ -410,7 +410,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
410410
{
411411
if( _infinityStream )
412412
{
413-
switchToDummyEssence();
413+
switchToGeneratorEssence();
414414
return processTranscode();
415415
}
416416
return false;
@@ -422,14 +422,14 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
422422
return true;
423423
}
424424

425-
void StreamTranscoder::switchEssence( bool swithToDummy )
425+
void StreamTranscoder::switchEssence( bool swithToGenerator )
426426
{
427-
_takeFromDummy = swithToDummy;
428-
_currentEssence = swithToDummy ? _dummyEssence : _inputEssence;
427+
_takeFromGenerator = swithToGenerator;
428+
_currentEssence = swithToGenerator ? _generatorEssence : _inputEssence;
429429
assert( _currentEssence != NULL );
430430
}
431431

432-
void StreamTranscoder::switchToDummyEssence()
432+
void StreamTranscoder::switchToGeneratorEssence()
433433
{
434434
switchEssence( true );
435435
}
@@ -448,7 +448,6 @@ double StreamTranscoder::getDuration() const
448448
// @todo add offset
449449
return totalDuration;
450450
}
451-
// dummy
452451
else
453452
return std::numeric_limits<double>::max();
454453
}

‎src/AvTranscoder/transcoder/StreamTranscoder.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class StreamTranscoder
3232
StreamTranscoder( IInputStream& inputStream, OutputFile& outputFile, const Profile::ProfileDesc& profile, const int subStreamIndex = -1, const size_t offset = 0 );
3333

3434
/**
35-
* @brief encode from dummy stream
35+
* @brief encode from a generated stream
3636
* @note offset feature has no sense here
3737
**/
3838
StreamTranscoder( IInputEssence& inputEssence, OutputFile& outputFile, const Profile::ProfileDesc& profile );
@@ -52,8 +52,8 @@ class StreamTranscoder
5252
*/
5353
bool processFrame();
5454

55-
void switchEssence( bool swithToDummy = true );
56-
void switchToDummyEssence();
55+
void switchEssence( bool swithToGenerator = true );
56+
void switchToGeneratorEssence();
5757
void switchToInputEssence();
5858

5959
void setVerbose( bool verbose = true ){ _verbose = verbose; }
@@ -64,7 +64,7 @@ class StreamTranscoder
6464

6565
/**
6666
* @brief Get the duration of the stream.
67-
* @note if it's a dummy stream, return limit of double.
67+
* @note if it's a generated stream, return limit of double.
6868
*/
6969
double getDuration() const;
7070

@@ -82,7 +82,7 @@ class StreamTranscoder
8282
Frame* _frameBuffer;
8383

8484
IInputEssence* _inputEssence;
85-
IInputEssence* _dummyEssence;
85+
IInputEssence* _generatorEssence;
8686
IInputEssence* _currentEssence;
8787
OutputEssence* _outputEssence;
8888

@@ -99,14 +99,14 @@ class StreamTranscoder
9999
*/
100100
size_t _offset;
101101

102-
bool _takeFromDummy;
102+
bool _takeFromGenerator;
103103

104104
bool _verbose;
105105

106106
bool _offsetPassed;
107107

108108
/**
109-
* @brief Automatic switch to dummy
109+
* @brief Automatic switch to a generator
110110
* @note not applicable when rewrap
111111
*/
112112
bool _infinityStream;

0 commit comments

Comments
 (0)