Skip to content

Commit 4741185

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
move files into CodedStream folder
1 parent bac184d commit 4741185

22 files changed

+40
-74
lines changed

‎app/audioRewrapper/audioRewrapper.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <AvTranscoder/File/InputFile.hpp>
55
#include <AvTranscoder/File/OutputFile.hpp>
66

7-
#include <AvTranscoder/AvInputStream.hpp>
87
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
98
#include <AvTranscoder/EssenceStream/OutputAudio.hpp>
109

‎app/avTranscoder/avTranscoder.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22
#include <iomanip>
33
#include <cstdlib>
44

5-
#include <AvTranscoder/AvInputStream.hpp>
5+
#include <AvTranscoder/File/InputFile.hpp>
6+
#include <AvTranscoder/File/OutputFile.hpp>
67
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
78
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
8-
#include <AvTranscoder/OutputStream.hpp>
99
#include <AvTranscoder/EssenceStream/OutputAudio.hpp>
1010
#include <AvTranscoder/EssenceStream/OutputVideo.hpp>
11-
12-
#include <AvTranscoder/File/InputFile.hpp>
13-
#include <AvTranscoder/File/OutputFile.hpp>
14-
1511
#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
1612

17-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
18-
#include <AvTranscoder/DatasStructures/Image.hpp>
19-
2013
void transcodeVideo( const char* inputfilename, const char* outputFilename )
2114
{
2215
using namespace avtranscoder;

‎app/avplay/AvReader.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
#ifndef _AVPLAYER_AVREADER_
22
#define _AVPLAYER_AVREADER_
33

4-
5-
#include <AvTranscoder/AvInputStream.hpp>
4+
#include <AvTranscoder/File/InputFile.hpp>
65
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
76
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
8-
#include <AvTranscoder/File/InputFile.hpp>
9-
107
#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
11-
128
#include <AvTranscoder/Metadatas/Print.hpp>
139

1410
#include "Reader.hpp"

‎src/AvTranscoder/AvInputStream.cpp renamed to ‎src/AvTranscoder/CodedStream/AvInputStream.cpp

File renamed without changes.

‎src/AvTranscoder/AvInputStream.hpp renamed to ‎src/AvTranscoder/CodedStream/AvInputStream.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#ifndef _AV_TRANSCODER_AV_INPUT_STREAM_HPP_
2-
#define _AV_TRANSCODER_AV_INPUT_STREAM_HPP_
1+
#ifndef _AV_TRANSCODER_CODED_STREAM_AV_INPUT_STREAM_HPP_
2+
#define _AV_TRANSCODER_CODED_STREAM_AV_INPUT_STREAM_HPP_
33

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

66
namespace avtranscoder
77
{

‎src/AvTranscoder/AvOutputStream.cpp renamed to ‎src/AvTranscoder/CodedStream/AvOutputStream.cpp

File renamed without changes.

‎src/AvTranscoder/AvOutputStream.hpp renamed to ‎src/AvTranscoder/CodedStream/AvOutputStream.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#ifndef _AV_TRANSCODER_AV_OUTPUT_STREAM_HPP_
2-
#define _AV_TRANSCODER_AV_OUTPUT_STREAM_HPP_
1+
#ifndef _AV_TRANSCODER_CODED_STREAM_AV_OUTPUT_STREAM_HPP_
2+
#define _AV_TRANSCODER_CODED_STREAM_AV_OUTPUT_STREAM_HPP_
33

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

66
namespace avtranscoder
77
{

‎src/AvTranscoder/InputStream.hpp renamed to ‎src/AvTranscoder/CodedStream/InputStream.hpp

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

4-
#include "DatasStructures/DataStreamDesc.hpp"
5-
#include "DatasStructures/AudioDesc.hpp"
6-
#include "DatasStructures/VideoDesc.hpp"
4+
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
5+
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
6+
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
77

88
namespace avtranscoder
99
{

‎src/AvTranscoder/OutputStream.hpp renamed to ‎src/AvTranscoder/CodedStream/OutputStream.hpp

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

4-
#include "DatasStructures/DataStreamDesc.hpp"
5-
#include "DatasStructures/AudioDesc.hpp"
6-
#include "DatasStructures/VideoDesc.hpp"
4+
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
5+
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
6+
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
77

88
namespace avtranscoder
99
{

‎src/AvTranscoder/DummyInputStream.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#ifndef _AV_TRANSCODER_DUMMY_INPUT_STREAM_HPP_
22
#define _AV_TRANSCODER_DUMMY_INPUT_STREAM_HPP_
33

4-
#include <AvTranscoder/InputStream.hpp>
5-
6-
#include <AvTranscoder/InputStream.hpp>
4+
#include <AvTranscoder/CodedStream/InputStream.hpp>
75
#include <AvTranscoder/DatasStructures/Image.hpp>
86
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
97

‎src/AvTranscoder/EssenceStream/InputAudio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extern "C" {
1111
#include <libavutil/channel_layout.h>
1212
}
1313

14-
#include <AvTranscoder/AvInputStream.hpp>
14+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
1515

1616
#include <iostream>
1717
#include <stdexcept>

‎src/AvTranscoder/EssenceStream/InputVideo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extern "C" {
1010
#include <libavutil/pixdesc.h>
1111
}
1212

13-
#include <AvTranscoder/AvInputStream.hpp>
13+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
1414

1515
#include <iostream>
1616
#include <stdexcept>

‎src/AvTranscoder/File/InputFile.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "InputFile.hpp"
2-
#include <AvTranscoder/AvInputStream.hpp>
32

43
#include <AvTranscoder/Metadatas/VideoStreamProperties.hpp>
54
#include <AvTranscoder/Metadatas/AudioStreamProperties.hpp>

‎src/AvTranscoder/File/InputFile.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef _AV_TRANSCODER_FILE_INPUT_FILE_HPP_
22
#define _AV_TRANSCODER_FILE_INPUT_FILE_HPP_
33

4-
#include <AvTranscoder/AvInputStream.hpp>
54
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
65
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
76
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
7+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
88
#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
99
#include <AvTranscoder/ProgressListener.hpp>
1010

‎src/AvTranscoder/File/OutputFile.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
66
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
77
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
8+
#include <AvTranscoder/CodedStream/AvOutputStream.hpp>
89

9-
#include <AvTranscoder/AvOutputStream.hpp>
1010

1111
#include <string>
1212
#include <vector>

‎src/AvTranscoder/InputStreamData.cpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/AvTranscoder/InputStreamData.hpp

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

‎src/AvTranscoder/StreamTranscoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "StreamTranscoder.hpp"
33

4-
#include <AvTranscoder/AvInputStream.hpp>
4+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
55

66
namespace avtranscoder
77
{

‎src/AvTranscoder/StreamTranscoder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
22
#define _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
33

4-
#include <AvTranscoder/InputStream.hpp>
4+
#include <AvTranscoder/CodedStream/InputStream.hpp>
55

66
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
77
#include <AvTranscoder/EssenceStream/OutputVideo.hpp>

‎src/AvTranscoder/Transcoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "Transcoder.hpp"
22

3-
#include <AvTranscoder/AvInputStream.hpp>
3+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
44

55
namespace avtranscoder
66
{

‎src/AvTranscoder/Transcoder.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33

44
#include <AvTranscoder/File/InputFile.hpp>
55
#include <AvTranscoder/File/OutputFile.hpp>
6-
#include <AvTranscoder/InputStream.hpp>
6+
#include <AvTranscoder/CodedStream/InputStream.hpp>
77
#include <AvTranscoder/ProgressListener.hpp>
88
#include <AvTranscoder/DummyInputStream.hpp>
99
#include <AvTranscoder/StreamTranscoder.hpp>
1010

11-
#include <AvTranscoder/StreamTranscoder.hpp>
12-
1311
#include <string>
1412
#include <vector>
1513

‎src/AvTranscoder/avTranscoder.i

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@
2121

2222
#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
2323

24-
#include <AvTranscoder/OutputStream.hpp>
25-
#include <AvTranscoder/AvOutputStream.hpp>
24+
#include <AvTranscoder/CodedStream/OutputStream.hpp>
25+
#include <AvTranscoder/CodedStream/AvOutputStream.hpp>
26+
27+
#include <AvTranscoder/CodedStream/InputStream.hpp>
28+
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
29+
2630
#include <AvTranscoder/EssenceStream/OutputEssence.hpp>
2731
#include <AvTranscoder/EssenceStream/OutputAudio.hpp>
2832
#include <AvTranscoder/EssenceStream/OutputVideo.hpp>
2933

30-
#include <AvTranscoder/InputStream.hpp>
31-
#include <AvTranscoder/AvInputStream.hpp>
3234
#include <AvTranscoder/EssenceStream/InputEssence.hpp>
3335
#include <AvTranscoder/EssenceStream/InputAudio.hpp>
3436
#include <AvTranscoder/EssenceStream/InputVideo.hpp>
@@ -65,14 +67,16 @@ namespace std {
6567

6668
%include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
6769

68-
%include <AvTranscoder/OutputStream.hpp>
69-
%include <AvTranscoder/AvOutputStream.hpp>
70+
%include <AvTranscoder/CodedStream/OutputStream.hpp>
71+
%include <AvTranscoder/CodedStream/AvOutputStream.hpp>
72+
73+
%include <AvTranscoder/CodedStream/InputStream.hpp>
74+
%include <AvTranscoder/CodedStream/AvInputStream.hpp>
75+
7076
%include <AvTranscoder/EssenceStream/OutputEssence.hpp>
7177
%include <AvTranscoder/EssenceStream/OutputAudio.hpp>
7278
%include <AvTranscoder/EssenceStream/OutputVideo.hpp>
7379

74-
%include <AvTranscoder/InputStream.hpp>
75-
%include <AvTranscoder/AvInputStream.hpp>
7680
%include <AvTranscoder/EssenceStream/InputEssence.hpp>
7781
%include <AvTranscoder/EssenceStream/InputAudio.hpp>
7882
%include <AvTranscoder/EssenceStream/InputVideo.hpp>

0 commit comments

Comments
 (0)