Renamed frame folder to data

Clement Champetier · Clement Champetier · commit 8fb40045121e · 2016-01-12T18:06:54.000+01:00
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -23,7 +23,7 @@
 
 %include "AvTranscoder/progress/progress.i"
 %include "AvTranscoder/properties/properties.i"
-%include "AvTranscoder/frame/frame.i"
+%include "AvTranscoder/data/data.i"
 %include "AvTranscoder/profile/profile.i"
 
 %include <AvTranscoder/Library.hpp>
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_CODEC_AUDIO_CODEC_HPP_
 
 #include "ICodec.hpp"
-#include <AvTranscoder/frame/AudioFrame.hpp>
+#include <AvTranscoder/data/AudioFrame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/codec/VideoCodec.hpp b/src/AvTranscoder/codec/VideoCodec.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_CODEC_VIDEO_CODEC_HPP_
 
 #include "ICodec.hpp"
-#include <AvTranscoder/frame/VideoFrame.hpp>
+#include <AvTranscoder/data/VideoFrame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/data/AudioFrame.cpp b/src/AvTranscoder/data/AudioFrame.cpp
diff --git a/src/AvTranscoder/data/AudioFrame.hpp b/src/AvTranscoder/data/AudioFrame.hpp
diff --git a/src/AvTranscoder/data/CodedData.cpp b/src/AvTranscoder/data/CodedData.cpp
diff --git a/src/AvTranscoder/data/CodedData.hpp b/src/AvTranscoder/data/CodedData.hpp
diff --git a/src/AvTranscoder/data/Frame.hpp b/src/AvTranscoder/data/Frame.hpp
diff --git a/src/AvTranscoder/data/VideoFrame.cpp b/src/AvTranscoder/data/VideoFrame.cpp
diff --git a/src/AvTranscoder/data/VideoFrame.hpp b/src/AvTranscoder/data/VideoFrame.hpp
diff --git a/src/AvTranscoder/data/data.i b/src/AvTranscoder/data/data.i
@@ -0,0 +1,13 @@
+%apply char * { unsigned char * };
+
+%{
+#include <AvTranscoder/data/CodedData.hpp>
+#include <AvTranscoder/data/Frame.hpp>
+#include <AvTranscoder/data/VideoFrame.hpp>
+#include <AvTranscoder/data/AudioFrame.hpp>
+%}
+
+%include <AvTranscoder/data/CodedData.hpp>
+%include <AvTranscoder/data/Frame.hpp>
+%include <AvTranscoder/data/VideoFrame.hpp>
+%include <AvTranscoder/data/AudioFrame.hpp>
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -2,7 +2,7 @@
 
 #include <AvTranscoder/codec/ICodec.hpp>
 #include <AvTranscoder/stream/InputStream.hpp>
-#include <AvTranscoder/frame/AudioFrame.hpp>
+#include <AvTranscoder/data/AudioFrame.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_IDECODER_HPP_
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 #include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -2,7 +2,7 @@
 
 #include <AvTranscoder/codec/ICodec.hpp>
 #include <AvTranscoder/stream/InputStream.hpp>
-#include <AvTranscoder/frame/VideoFrame.hpp>
+#include <AvTranscoder/data/VideoFrame.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
diff --git a/src/AvTranscoder/encoder/IEncoder.hpp b/src/AvTranscoder/encoder/IEncoder.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_IENCODER_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_IENCODER_HPP_
 
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 #include <AvTranscoder/codec/ICodec.hpp>
 #include <AvTranscoder/profile/ProfileLoader.hpp>
 
diff --git a/src/AvTranscoder/frame/frame.i b/src/AvTranscoder/frame/frame.i
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -1,7 +1,7 @@
 #include "AudioReader.hpp"
 
 #include <AvTranscoder/decoder/AudioDecoder.hpp>
-#include <AvTranscoder/frame/AudioFrame.hpp>
+#include <AvTranscoder/data/AudioFrame.hpp>
 #include <AvTranscoder/transform/AudioTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
diff --git a/src/AvTranscoder/reader/IReader.hpp b/src/AvTranscoder/reader/IReader.hpp
@@ -6,7 +6,7 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/properties/StreamProperties.hpp>
 #include <AvTranscoder/decoder/IDecoder.hpp>
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 #include <AvTranscoder/transform/ITransform.hpp>
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -1,7 +1,7 @@
 #include "VideoReader.hpp"
 
 #include <AvTranscoder/decoder/VideoDecoder.hpp>
-#include <AvTranscoder/frame/VideoFrame.hpp>
+#include <AvTranscoder/data/VideoFrame.hpp>
 #include <AvTranscoder/transform/VideoTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -7,7 +7,7 @@
 #include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
 
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -1,6 +1,6 @@
 #include "AudioTransform.hpp"
 
-#include <AvTranscoder/frame/AudioFrame.hpp>
+#include <AvTranscoder/data/AudioFrame.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -4,7 +4,7 @@
 #include "ITransform.hpp"
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 
 #ifdef AVTRANSCODER_LIBAV_DEPENDENCY
 #define ResampleContext AVAudioResampleContext
diff --git a/src/AvTranscoder/transform/ITransform.hpp b/src/AvTranscoder/transform/ITransform.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_ESSENCE_TRANSFORM_HPP_
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -1,6 +1,6 @@
 #include "VideoTransform.hpp"
 
-#include <AvTranscoder/frame/VideoFrame.hpp>
+#include <AvTranscoder/data/VideoFrame.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp
@@ -5,7 +5,7 @@
 
 #include "ITransform.hpp"
 
-#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/data/Frame.hpp>
 
 class SwsContext;
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#define _AV_TRANSCODER_CODEC_AUDIO_CODEC_HPP_`
`3`	`3`
`4`	`4`	`#include "ICodec.hpp"`
`5`		`-#include <AvTranscoder/frame/AudioFrame.hpp>`
	`5`	`+#include <AvTranscoder/data/AudioFrame.hpp>`
`6`	`6`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#define _AV_TRANSCODER_CODEC_VIDEO_CODEC_HPP_`
`3`	`3`
`4`	`4`	`#include "ICodec.hpp"`
`5`		`-#include <AvTranscoder/frame/VideoFrame.hpp>`
	`5`	`+#include <AvTranscoder/data/VideoFrame.hpp>`
`6`	`6`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <AvTranscoder/codec/VideoCodec.hpp>`
`8`	`8`	`#include <AvTranscoder/codec/DataCodec.hpp>`
`9`	`9`
`10`		`-#include <AvTranscoder/frame/Frame.hpp>`
	`10`	`+#include <AvTranscoder/data/Frame.hpp>`
`11`	`11`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <AvTranscoder/codec/AudioCodec.hpp>`
`5`	`5`	`#include <AvTranscoder/codec/VideoCodec.hpp>`
`6`		`-#include <AvTranscoder/frame/Frame.hpp>`
	`6`	`+#include <AvTranscoder/data/Frame.hpp>`
`7`	`7`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#define _AV_TRANSCODER_ESSENCE_TRANSFORM_ESSENCE_TRANSFORM_HPP_`
`3`	`3`
`4`	`4`	`#include <AvTranscoder/common.hpp>`
`5`		`-#include <AvTranscoder/frame/Frame.hpp>`
	`5`	`+#include <AvTranscoder/data/Frame.hpp>`
`6`	`6`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`