Skip to content

Commit f7fcd74

Browse files
author
Clement Champetier
committed
DatasStructures: split in CodedStructures and EssenceStructures
1 parent 717aa26 commit f7fcd74

33 files changed

+62
-80
lines changed

‎src/AvTranscoder/CodedStream/AvInputStream.hpp

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

44
#include "InputStream.hpp"
55

6+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
7+
68
namespace avtranscoder
79
{
810

‎src/AvTranscoder/CodedStream/InputStream.hpp

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

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

88
namespace avtranscoder
99
{

‎src/AvTranscoder/CodedStream/OutputStream.hpp

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

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

88
namespace avtranscoder
99
{

‎src/AvTranscoder/DatasStructures/AudioDesc.cpp renamed to ‎src/AvTranscoder/CodedStructures/AudioDesc.cpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/AudioDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/AudioDesc.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ extern "C" {
1515
}
1616

1717
#include <AvTranscoder/common.hpp>
18-
#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
19-
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
18+
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
19+
#include "EssenceDesc.hpp"
2020

2121
namespace avtranscoder
2222
{

‎src/AvTranscoder/DatasStructures/DataStreamDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/DataStreamDesc.hpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/EssenceDesc.cpp renamed to ‎src/AvTranscoder/CodedStructures/EssenceDesc.cpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/EssenceDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/EssenceDesc.hpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/VideoDesc.cpp renamed to ‎src/AvTranscoder/CodedStructures/VideoDesc.cpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/VideoDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/VideoDesc.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ extern "C" {
1515
}
1616

1717
#include <AvTranscoder/common.hpp>
18-
#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
19-
#include <AvTranscoder/DatasStructures/Image.hpp>
18+
#include <AvTranscoder/EssenceStructures/Image.hpp>
19+
#include "EssenceDesc.hpp"
2020

2121
namespace avtranscoder
2222
{

‎src/AvTranscoder/EssenceStream/DummyAudio.hpp

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

44
#include "InputEssence.hpp"
55

6-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
7-
#include <AvTranscoder/DatasStructures/Frame.hpp>
6+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
7+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
88

99
namespace avtranscoder
1010
{

‎src/AvTranscoder/EssenceStream/DummyVideo.hpp

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

44
#include "InputEssence.hpp"
55

6-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
7-
#include <AvTranscoder/DatasStructures/Frame.hpp>
6+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
7+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
88

99
namespace avtranscoder
1010
{

‎src/AvTranscoder/EssenceStream/InputAudio.hpp

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

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

77
class AVFormatContext;
88
class AVCodec;

‎src/AvTranscoder/EssenceStream/InputEssence.hpp

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

44
#include <AvTranscoder/common.hpp>
5-
#include <AvTranscoder/DatasStructures/Frame.hpp>
5+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
66

77
namespace avtranscoder
88
{

‎src/AvTranscoder/EssenceStream/InputVideo.hpp

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

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

77
#include <vector>
88

‎src/AvTranscoder/EssenceStream/OutputAudio.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ extern "C" {
99
#include <libavutil/avutil.h>
1010
}
1111

12-
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
13-
#include <AvTranscoder/Profile.hpp>
14-
1512
#include <stdexcept>
1613
#include <cstdlib>
1714

‎src/AvTranscoder/EssenceStream/OutputAudio.hpp

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

44
#include "OutputEssence.hpp"
55

6-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
7-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
8-
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
6+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
7+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
8+
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
99

1010
#include <AvTranscoder/Profile.hpp>
1111

‎src/AvTranscoder/EssenceStream/OutputEssence.hpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_ESSENCE_HPP_
22
#define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_ESSENCE_HPP_
33

4-
extern "C" {
5-
#ifndef __STDC_CONSTANT_MACROS
6-
#define __STDC_CONSTANT_MACROS
7-
#endif
8-
#include <libavutil/pixfmt.h>
9-
}
10-
11-
#include <string>
12-
#include <vector>
13-
14-
#include <AvTranscoder/DatasStructures/Frame.hpp>
15-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
4+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
5+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
166

177
#include <AvTranscoder/Profile.hpp>
188

‎src/AvTranscoder/EssenceStream/OutputVideo.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ extern "C" {
1212
#include <libavutil/mathematics.h>
1313
}
1414

15-
#include <AvTranscoder/DatasStructures/Image.hpp>
16-
#include <AvTranscoder/Profile.hpp>
17-
1815
#include <stdexcept>
1916
#include <cstdlib>
2017

‎src/AvTranscoder/EssenceStream/OutputVideo.hpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
22
#define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
33

4-
extern "C" {
5-
#ifndef __STDC_CONSTANT_MACROS
6-
#define __STDC_CONSTANT_MACROS
7-
#endif
8-
#include <libavutil/pixfmt.h>
9-
}
10-
114
#include "OutputEssence.hpp"
125

13-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
14-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
15-
#include <AvTranscoder/DatasStructures/Image.hpp>
6+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
7+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
8+
#include <AvTranscoder/EssenceStructures/Image.hpp>
169

1710
#include <AvTranscoder/Profile.hpp>
1811

‎src/AvTranscoder/DatasStructures/AudioFrame.hpp renamed to ‎src/AvTranscoder/EssenceStructures/AudioFrame.hpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/Frame.hpp renamed to ‎src/AvTranscoder/EssenceStructures/Frame.hpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/Image.hpp renamed to ‎src/AvTranscoder/EssenceStructures/Image.hpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/Pixel.cpp renamed to ‎src/AvTranscoder/EssenceStructures/Pixel.cpp

File renamed without changes.

‎src/AvTranscoder/DatasStructures/Pixel.hpp renamed to ‎src/AvTranscoder/EssenceStructures/Pixel.hpp

File renamed without changes.

‎src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp

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

55
extern "C" {
66
#ifndef __STDC_CONSTANT_MACROS
@@ -28,7 +28,7 @@ extern "C" {
2828
#endif
2929
}
3030

31-
#include <stdexcept>
31+
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
3232

3333
namespace avtranscoder
3434
{

‎src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
22
#define _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
33

4-
#include <AvTranscoder/DatasStructures/Frame.hpp>
54
#include "EssenceTransform.hpp"
65

6+
#include <AvTranscoder/common.hpp>
7+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
8+
79
#ifdef AV_RESAMPLE_LIBRARY
810
#define ResampleContext AVAudioResampleContext
911
#else

‎src/AvTranscoder/EssenceTransform/EssenceTransform.hpp

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

4-
#include <AvTranscoder/DatasStructures/Frame.hpp>
4+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
55

66
namespace avtranscoder
77
{

‎src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ extern "C" {
1414
#endif
1515
}
1616

17-
#include <AvTranscoder/DatasStructures/Pixel.hpp>
18-
#include <AvTranscoder/DatasStructures/Image.hpp>
17+
#include <AvTranscoder/EssenceStructures/Pixel.hpp>
18+
#include <AvTranscoder/EssenceStructures/Image.hpp>
1919

2020
#include <iostream>
2121
#include <iomanip>

‎src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp

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

4-
#include <AvTranscoder/DatasStructures/Frame.hpp>
4+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
55
#include "EssenceTransform.hpp"
66

77
#include <vector>

‎src/AvTranscoder/File/InputFile.hpp

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

4-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
5-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
6-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
4+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
5+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
6+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
77
#include <AvTranscoder/CodedStream/AvInputStream.hpp>
88
#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
99
#include <AvTranscoder/ProgressListener.hpp>

‎src/AvTranscoder/File/OutputFile.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#ifndef _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
22
#define _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
33

4-
#include <AvTranscoder/DatasStructures/Image.hpp>
5-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
6-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
7-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
4+
#include <AvTranscoder/EssenceStructures/Image.hpp>
5+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
6+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
7+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
88
#include <AvTranscoder/CodedStream/AvOutputStream.hpp>
99

10-
1110
#include <string>
1211
#include <vector>
1312

‎src/AvTranscoder/avTranscoder.i

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
%{
1212
#include <AvTranscoder/common.hpp>
1313

14-
#include <AvTranscoder/DatasStructures/Pixel.hpp>
15-
#include <AvTranscoder/DatasStructures/Frame.hpp>
16-
#include <AvTranscoder/DatasStructures/Image.hpp>
17-
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
18-
#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
19-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
20-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
21-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
14+
#include <AvTranscoder/EssenceStructures/Pixel.hpp>
15+
#include <AvTranscoder/EssenceStructures/Frame.hpp>
16+
#include <AvTranscoder/EssenceStructures/Image.hpp>
17+
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
18+
19+
#include <AvTranscoder/CodedStructures/EssenceDesc.hpp>
20+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
21+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
22+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
2223

2324
#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
2425

@@ -64,14 +65,15 @@ namespace std {
6465

6566
%include <AvTranscoder/common.hpp>
6667

67-
%include <AvTranscoder/DatasStructures/Pixel.hpp>
68-
%include <AvTranscoder/DatasStructures/Frame.hpp>
69-
%include <AvTranscoder/DatasStructures/Image.hpp>
70-
%include <AvTranscoder/DatasStructures/AudioFrame.hpp>
71-
%include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
72-
%include <AvTranscoder/DatasStructures/VideoDesc.hpp>
73-
%include <AvTranscoder/DatasStructures/AudioDesc.hpp>
74-
%include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
68+
%include <AvTranscoder/EssenceStructures/Pixel.hpp>
69+
%include <AvTranscoder/EssenceStructures/Frame.hpp>
70+
%include <AvTranscoder/EssenceStructures/Image.hpp>
71+
%include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
72+
73+
%include <AvTranscoder/CodedStructures/EssenceDesc.hpp>
74+
%include <AvTranscoder/CodedStructures/VideoDesc.hpp>
75+
%include <AvTranscoder/CodedStructures/AudioDesc.hpp>
76+
%include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
7577

7678
%include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
7779

0 commit comments

Comments
 (0)