Skip to content

Commit 5d846be

Browse files
author
Clement Champetier
committed
Split 'essenceStream' folder into 'decoder' and 'encoder' folders
Also add SWIG interface for each directory.
1 parent 7674f90 commit 5d846be

24 files changed

+47
-51
lines changed

‎app/avTranscoder/avTranscoder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#include <AvTranscoder/frame/Frame.hpp>
99

10-
#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
11-
#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
10+
#include <AvTranscoder/decoder/VideoDecoder.hpp>
11+
#include <AvTranscoder/encoder/VideoEncoder.hpp>
1212

1313
#include <AvTranscoder/transform/VideoTransform.hpp>
1414

‎app/avplay/AvReader.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#include <AvTranscoder/progress/ConsoleProgress.hpp>
66
#include <AvTranscoder/mediaProperty/print.hpp>
77

8-
#include <AvTranscoder/essenceStream/AudioDecoder.hpp>
9-
#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
8+
#include <AvTranscoder/decoder/VideoDecoder.hpp>
109

1110
#include <AvTranscoder/transform/VideoTransform.hpp>
1211

‎app/presetChecker/presetChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <iomanip>
44
#include <AvTranscoder/ProfileLoader.hpp>
55

6-
#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
7-
#include <AvTranscoder/essenceStream/AudioEncoder.hpp>
6+
#include <AvTranscoder/encoder/VideoEncoder.hpp>
7+
#include <AvTranscoder/encoder/AudioEncoder.hpp>
88

99

1010
int main( int argc, char** argv )

‎src/AvTranscoder/avTranscoder.i

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
#include <AvTranscoder/codedStream/IInputStream.hpp>
2727
#include <AvTranscoder/codedStream/AvInputStream.hpp>
2828

29-
#include <AvTranscoder/essenceStream/IEncoder.hpp>
30-
#include <AvTranscoder/essenceStream/AudioEncoder.hpp>
31-
#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
32-
33-
#include <AvTranscoder/essenceStream/IDecoder.hpp>
34-
#include <AvTranscoder/essenceStream/AudioDecoder.hpp>
35-
#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
36-
#include <AvTranscoder/essenceStream/VideoGenerator.hpp>
37-
#include <AvTranscoder/essenceStream/AudioGenerator.hpp>
38-
3929
#include <AvTranscoder/transcoder/StreamTranscoder.hpp>
4030
#include <AvTranscoder/transcoder/Transcoder.hpp>
4131
%}
@@ -64,16 +54,8 @@ namespace std {
6454
%include <AvTranscoder/codedStream/IInputStream.hpp>
6555
%include <AvTranscoder/codedStream/AvInputStream.hpp>
6656

67-
%include <AvTranscoder/essenceStream/IEncoder.hpp>
68-
%include <AvTranscoder/essenceStream/AudioEncoder.hpp>
69-
%include <AvTranscoder/essenceStream/VideoEncoder.hpp>
70-
71-
%include <AvTranscoder/essenceStream/IDecoder.hpp>
72-
%include <AvTranscoder/essenceStream/AudioDecoder.hpp>
73-
%include <AvTranscoder/essenceStream/VideoDecoder.hpp>
74-
%include <AvTranscoder/essenceStream/VideoGenerator.hpp>
75-
%include <AvTranscoder/essenceStream/AudioGenerator.hpp>
76-
57+
%include "AvTranscoder/decoder/decoder.i"
58+
%include "AvTranscoder/encoder/encoder.i"
7759
%include "AvTranscoder/file/file.i"
7860

7961
%include <AvTranscoder/transcoder/StreamTranscoder.hpp>

‎src/AvTranscoder/essenceStream/AudioDecoder.cpp renamed to ‎src/AvTranscoder/decoder/AudioDecoder.cpp

File renamed without changes.

‎src/AvTranscoder/essenceStream/AudioDecoder.hpp renamed to ‎src/AvTranscoder/decoder/AudioDecoder.hpp

File renamed without changes.

‎src/AvTranscoder/essenceStream/AudioGenerator.cpp renamed to ‎src/AvTranscoder/decoder/AudioGenerator.cpp

File renamed without changes.

‎src/AvTranscoder/essenceStream/AudioGenerator.hpp renamed to ‎src/AvTranscoder/decoder/AudioGenerator.hpp

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

44
#include "IDecoder.hpp"
55
#include <AvTranscoder/codec/AudioCodec.hpp>

‎src/AvTranscoder/essenceStream/IDecoder.hpp renamed to ‎src/AvTranscoder/decoder/IDecoder.hpp

File renamed without changes.

‎src/AvTranscoder/essenceStream/VideoDecoder.cpp renamed to ‎src/AvTranscoder/decoder/VideoDecoder.cpp

File renamed without changes.

0 commit comments

Comments
 (0)