Skip to content

Commit 92b0059

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
rename InputStream's as EssenceStream
1 parent 7293763 commit 92b0059

File tree

13 files changed

+89
-104
lines changed

13 files changed

+89
-104
lines changed

‎app/audioRewrapper/audioRewrapper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <AvTranscoder/File/OutputFile.hpp>
66

77
#include <AvTranscoder/AvInputStream.hpp>
8-
#include <AvTranscoder/InputStreamAudio.hpp>
8+
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
99
#include <AvTranscoder/OutputStreamAudio.hpp>
1010

1111
#include <AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp>
@@ -70,7 +70,7 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )
7070

7171
// init audio decoders
7272
size_t audioStreamId = inputFile.getProperties().audioStreams.at( 0 ).streamId;
73-
InputStreamAudio inputStreamAudio( inputFile.getStream( audioStreamId ) );
73+
InputAudio inputAudio( inputFile.getStream( audioStreamId ) );
7474
inputFile.readStream( audioStreamId );
7575

7676
// init audio encoders
@@ -103,7 +103,7 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )
103103
AudioFrame audioFrameToEncode( audioOutputDesc.getFrameDesc() );
104104

105105
size_t frame = 0;
106-
while( inputStreamAudio.readNextFrame( audioFrameSource ) )
106+
while( inputAudio.readNextFrame( audioFrameSource ) )
107107
{
108108
std::cout << "\rprocess frame " << (int)frame - 1 << std::flush;
109109

‎app/avTranscoder/avTranscoder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <cstdlib>
44

55
#include <AvTranscoder/AvInputStream.hpp>
6-
#include <AvTranscoder/InputStreamAudio.hpp>
7-
#include <AvTranscoder/InputStreamVideo.hpp>
6+
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
7+
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
88
#include <AvTranscoder/OutputStream.hpp>
99
#include <AvTranscoder/OutputStreamAudio.hpp>
1010
#include <AvTranscoder/OutputStreamVideo.hpp>
@@ -31,7 +31,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
3131
input.readStream( input.getProperties().videoStreams.at( 0 ).streamId );
3232

3333
// init video decoders
34-
InputStreamVideo inputStreamVideo( input.getStream( 0 ) );
34+
InputVideo inputVideo( input.getStream( 0 ) );
3535
Image sourceImage( input.getStream( 0 ).getVideoDesc().getImageDesc() );
3636

3737
// init video encoder
@@ -64,7 +64,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
6464

6565
size_t frame = 1;
6666

67-
while( inputStreamVideo.readNextFrame( sourceImage ) )
67+
while( inputVideo.readNextFrame( sourceImage ) )
6868
{
6969
std::cout << "\rprocess frame " << frame << std::flush;
7070

‎app/avplay/AvReader.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44

55
#include <AvTranscoder/AvInputStream.hpp>
6-
#include <AvTranscoder/InputStreamAudio.hpp>
7-
#include <AvTranscoder/InputStreamVideo.hpp>
6+
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
7+
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
88
#include <AvTranscoder/File/InputFile.hpp>
99

1010
#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
@@ -18,7 +18,7 @@ class AvReader : public Reader
1818
public:
1919
AvReader( const std::string& filename )
2020
: m_inputFile( filename )
21-
, m_inputStreamVideo( NULL )
21+
, m_inputVideo( NULL )
2222
, m_sourceImage( NULL )
2323
, m_imageToDisplay( NULL )
2424
{
@@ -29,7 +29,7 @@ class AvReader : public Reader
2929

3030
m_inputFile.readStream( m_videoStream );
3131

32-
m_inputStreamVideo = new avtranscoder::InputStreamVideo( m_inputFile.getStream( m_videoStream ) );
32+
m_inputVideo = new avtranscoder::InputVideo( m_inputFile.getStream( m_videoStream ) );
3333

3434
m_sourceImage = new avtranscoder::Image( m_inputFile.getStream( m_videoStream ).getVideoDesc().getImageDesc() );
3535

@@ -51,7 +51,7 @@ class AvReader : public Reader
5151

5252
~AvReader()
5353
{
54-
delete m_inputStreamVideo;
54+
delete m_inputVideo;
5555
delete m_sourceImage;
5656
delete m_imageToDisplay;
5757
}
@@ -79,7 +79,7 @@ class AvReader : public Reader
7979
const char* readNextFrame()
8080
{
8181
++currentFrame;
82-
m_inputStreamVideo->readNextFrame( *m_sourceImage );
82+
m_inputVideo->readNextFrame( *m_sourceImage );
8383
m_videoEssenceTransform.convert( *m_sourceImage, *m_imageToDisplay );
8484
return (const char*)m_imageToDisplay->getPtr();
8585
}
@@ -94,7 +94,7 @@ class AvReader : public Reader
9494
{
9595
// /std::cout << "seek at " << frame << std::endl;
9696
m_inputFile.seekAtFrame( frame );
97-
m_inputStreamVideo->flushDecoder();
97+
m_inputVideo->flushDecoder();
9898
return readNextFrame();
9999
}
100100

@@ -106,7 +106,7 @@ class AvReader : public Reader
106106
private:
107107
avtranscoder::InputFile m_inputFile;
108108

109-
avtranscoder::InputStreamVideo* m_inputStreamVideo;
109+
avtranscoder::InputVideo* m_inputVideo;
110110

111111
avtranscoder::Image* m_sourceImage;
112112
avtranscoder::Image* m_imageToDisplay;

‎src/AvTranscoder/InputStreamAudio.cpp renamed to ‎src/AvTranscoder/EssenceStream/InputAudio.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include "InputStreamAudio.hpp"
2-
#include "common.hpp"
1+
#include "InputAudio.hpp"
32

43
extern "C" {
54
#ifndef __STDC_CONSTANT_MACROS
@@ -12,16 +11,16 @@ extern "C" {
1211
#include <libavutil/channel_layout.h>
1312
}
1413

15-
#include "AvInputStream.hpp"
14+
#include <AvTranscoder/AvInputStream.hpp>
1615

1716
#include <iostream>
1817
#include <stdexcept>
1918

2019
namespace avtranscoder
2120
{
2221

23-
InputStreamAudio::InputStreamAudio( AvInputStream& inputStream )
24-
: InputStreamReader( inputStream )
22+
InputAudio::InputAudio( AvInputStream& inputStream )
23+
: InputEssence ( inputStream )
2524
, _inputStream ( &inputStream )
2625
, _codec ( NULL )
2726
, _codecContext ( NULL )
@@ -30,7 +29,7 @@ InputStreamAudio::InputStreamAudio( AvInputStream& inputStream )
3029
{
3130
}
3231

33-
InputStreamAudio::~InputStreamAudio()
32+
InputAudio::~InputAudio()
3433
{
3534
if( _codecContext != NULL )
3635
{
@@ -54,7 +53,7 @@ InputStreamAudio::~InputStreamAudio()
5453
}
5554

5655

57-
void InputStreamAudio::setup()
56+
void InputAudio::setup()
5857
{
5958
avcodec_register_all();
6059

@@ -107,7 +106,7 @@ void InputStreamAudio::setup()
107106
}
108107
}
109108

110-
bool InputStreamAudio::readNextFrame( Frame& frameBuffer )
109+
bool InputAudio::readNextFrame( Frame& frameBuffer )
111110
{
112111
if( ! getNextFrame() )
113112
return false;
@@ -134,7 +133,7 @@ bool InputStreamAudio::readNextFrame( Frame& frameBuffer )
134133
return true;
135134
}
136135

137-
bool InputStreamAudio::readNextFrame( std::vector<Frame>& frameBuffer )
136+
bool InputAudio::readNextFrame( std::vector<Frame>& frameBuffer )
138137
{
139138
if( ! getNextFrame() )
140139
return false;
@@ -162,7 +161,7 @@ bool InputStreamAudio::readNextFrame( std::vector<Frame>& frameBuffer )
162161
return true;
163162
}
164163

165-
bool InputStreamAudio::getNextFrame()
164+
bool InputAudio::getNextFrame()
166165
{
167166
int got_frame = 0;
168167
while( ! got_frame )

‎src/AvTranscoder/InputStreamAudio.hpp renamed to ‎src/AvTranscoder/EssenceStream/InputAudio.hpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#ifndef _AV_TRANSCODER_INPUT_STREAM_AUDIO_HPP_
2-
#define _AV_TRANSCODER_INPUT_STREAM_AUDIO_HPP_
1+
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_INPUT_AUDIO_HPP_
2+
#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_AUDIO_HPP_
33

4-
#include "InputStreamReader.hpp"
5-
#include "DatasStructures/AudioFrame.hpp"
4+
#include "InputEssence.hpp"
5+
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
66

77
class AVFormatContext;
88
class AVCodec;
@@ -14,20 +14,18 @@ namespace avtranscoder
1414

1515
class AvInputStream;
1616

17-
class AvExport InputStreamAudio : public InputStreamReader
17+
class AvExport InputAudio : public InputEssence
1818
{
1919
public:
20-
InputStreamAudio( AvInputStream& inputStream );
21-
~InputStreamAudio();
20+
InputAudio( AvInputStream& inputStream );
21+
~InputAudio();
2222

2323
void setup();
2424

2525
bool readNextFrame( Frame& frameBuffer );
26-
2726
bool readNextFrame( std::vector<Frame>& frameBuffer );
2827

2928
private:
30-
3129
bool getNextFrame();
3230

3331
AvInputStream* _inputStream;

‎src/AvTranscoder/EssenceStream/InputEssence.hpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_INPUT_ESSENCE_HPP_
2+
#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_ESSENCE_HPP_
3+
4+
#include <AvTranscoder/common.hpp>
5+
#include <AvTranscoder/DatasStructures/Frame.hpp>
6+
7+
namespace avtranscoder
8+
{
9+
10+
class AvInputStream;
11+
12+
class AvExport InputEssence
13+
{
14+
public:
15+
InputEssence( AvInputStream& inputStream ) {};
16+
17+
virtual ~InputEssence() {};
18+
19+
virtual void setup() = 0;
20+
21+
virtual bool readNextFrame( Frame& frameBuffer ) = 0;
22+
};
23+
24+
}
25+
26+
#endif

‎src/AvTranscoder/InputStreamVideo.cpp renamed to ‎src/AvTranscoder/EssenceStream/InputVideo.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include "InputStreamVideo.hpp"
2-
#include "common.hpp"
1+
#include "InputVideo.hpp"
32

43
extern "C" {
54
#ifndef __STDC_CONSTANT_MACROS
@@ -11,16 +10,16 @@ extern "C" {
1110
#include <libavutil/pixdesc.h>
1211
}
1312

14-
#include "AvInputStream.hpp"
13+
#include <AvTranscoder/AvInputStream.hpp>
1514

1615
#include <iostream>
1716
#include <stdexcept>
1817

1918
namespace avtranscoder
2019
{
2120

22-
InputStreamVideo::InputStreamVideo( AvInputStream& inputStream )
23-
: InputStreamReader::InputStreamReader( inputStream )
21+
InputVideo::InputVideo( AvInputStream& inputStream )
22+
: InputEssence ( inputStream )
2423
, _inputStream ( &inputStream )
2524
, _codec ( NULL )
2625
, _codecContext ( NULL )
@@ -29,7 +28,7 @@ InputStreamVideo::InputStreamVideo( AvInputStream& inputStream )
2928
{
3029
}
3130

32-
InputStreamVideo::~InputStreamVideo()
31+
InputVideo::~InputVideo()
3332
{
3433
if( _codecContext != NULL )
3534
{
@@ -52,7 +51,7 @@ InputStreamVideo::~InputStreamVideo()
5251
}
5352
}
5453

55-
void InputStreamVideo::setup()
54+
void InputVideo::setup()
5655
{
5756
av_register_all();
5857

@@ -95,7 +94,7 @@ void InputStreamVideo::setup()
9594
}
9695
}
9796

98-
bool InputStreamVideo::readNextFrame( Frame& frameBuffer )
97+
bool InputVideo::readNextFrame( Frame& frameBuffer )
9998
{
10099
int got_frame = 0;
101100

@@ -137,7 +136,7 @@ bool InputStreamVideo::readNextFrame( Frame& frameBuffer )
137136
return true;
138137
}
139138

140-
void InputStreamVideo::flushDecoder()
139+
void InputVideo::flushDecoder()
141140
{
142141
avcodec_flush_buffers( _codecContext );
143142
}

‎src/AvTranscoder/InputStreamVideo.hpp renamed to ‎src/AvTranscoder/EssenceStream/InputVideo.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#ifndef _AV_TRANSCODER_INPUT_STREAM_VIDEO_HPP_
2-
#define _AV_TRANSCODER_INPUT_STREAM_VIDEO_HPP_
1+
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
2+
#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
33

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

77
#include <vector>
88

@@ -16,11 +16,11 @@ namespace avtranscoder
1616

1717
class AvInputStream;
1818

19-
class AvExport InputStreamVideo : public InputStreamReader
19+
class AvExport InputVideo : public InputEssence
2020
{
2121
public:
22-
InputStreamVideo( AvInputStream& inputStream );
23-
~InputStreamVideo();
22+
InputVideo( AvInputStream& inputStream );
23+
~InputVideo();
2424

2525
void setup();
2626

‎src/AvTranscoder/InputStreamReader.hpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/AvTranscoder/Metadatas/Print.hpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
#ifndef _AV_TRANSCODER_PRINT_HPP_
22
#define _AV_TRANSCODER_PRINT_HPP_
33

4-
5-
#include <AvTranscoder/InputStream.hpp>
6-
#include <AvTranscoder/InputStreamAudio.hpp>
7-
#include <AvTranscoder/InputStreamVideo.hpp>
8-
#include <AvTranscoder/OutputStream.hpp>
9-
#include <AvTranscoder/OutputStreamAudio.hpp>
10-
#include <AvTranscoder/OutputStreamVideo.hpp>
11-
124
#include <AvTranscoder/File/InputFile.hpp>
13-
#include <AvTranscoder/File/OutputFile.hpp>
14-
15-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
16-
#include <AvTranscoder/DatasStructures/Image.hpp>
175

186
#include <iostream>
197
#include <iomanip>

0 commit comments

Comments
 (0)