Add profile directory

Clement Champetier · Clement Champetier · commit ecb2ffba89b9 · 2015-02-27T16:04:25.000+01:00
Contains ProfileLoader and the corresponding SWIG interface.
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -15,21 +15,18 @@
 %include "AvTranscoder/swig/avLogLevel.i"
 
 %{
-#include <AvTranscoder/ProfileLoader.hpp>
 #include <AvTranscoder/Option.hpp>
 %}
 
 namespace std {
 %template(IntPair)         pair< size_t, size_t >;
-%template(ProfileMap)      map< string, string >;
-%template(ProfilesVector)  vector< map< string, string > >;
 }
 
 %include "AvTranscoder/progress/progress.i"
 %include "AvTranscoder/mediaProperty/mediaProperty.i"
 %include "AvTranscoder/frame/frame.i"
+%include "AvTranscoder/profile/profile.i"
 
-%include <AvTranscoder/ProfileLoader.hpp>
 %include <AvTranscoder/Option.hpp>
 
 %include "AvTranscoder/codec/codec.i"
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 
 #include "IDecoder.hpp"
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 struct AVFrame;
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_DECODER_VIDEO_DECODER_HPP_
 
 #include "IDecoder.hpp"
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 struct AVFrame;
 
diff --git a/src/AvTranscoder/encoder/AudioEncoder.hpp b/src/AvTranscoder/encoder/AudioEncoder.hpp
@@ -3,7 +3,7 @@
 
 #include "IEncoder.hpp"
 #include <AvTranscoder/codec/AudioCodec.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/encoder/VideoEncoder.hpp b/src/AvTranscoder/encoder/VideoEncoder.hpp
@@ -3,7 +3,7 @@
 
 #include "IEncoder.hpp"
 #include <AvTranscoder/codec/VideoCodec.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/file/IOutputFile.hpp b/src/AvTranscoder/file/IOutputFile.hpp
@@ -8,7 +8,6 @@
 #include <AvTranscoder/codec/DataCodec.hpp>
 
 #include <AvTranscoder/stream/OutputStream.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
 
 #include <string>
 #include <stdexcept>
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -7,7 +7,7 @@
 #include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/mediaProperty/FileProperties.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 #include <string>
 #include <vector>
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_FRAME_AUDIO_FRAME_HPP_
 
 #include "Frame.hpp"
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 extern "C" {
 #include <libavutil/samplefmt.h>
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_FRAME_VIDEO_FRAME_HPP_
 
 #include "Frame.hpp"
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 extern "C" {
 #include <libavutil/pixfmt.h>
diff --git a/src/AvTranscoder/profile/ProfileLoader.cpp b/src/AvTranscoder/profile/ProfileLoader.cpp
@@ -1,7 +1,5 @@
 #include "ProfileLoader.hpp"
 
-#include "common.hpp"
-
 #include <iostream>
 #include <fstream>
 #include <cstdlib>
@@ -21,7 +19,7 @@ void ProfileLoader::loadProfile( const std::string& avProfileFileName )
 {
 	std::ifstream infile;
 	infile.open( avProfileFileName.c_str(), std::ifstream::in );
-	
+
 	ProfileLoader::Profile customProfile;
 
 	std::string line;
@@ -36,7 +34,7 @@ void ProfileLoader::loadProfile( const std::string& avProfileFileName )
 }
 
 void ProfileLoader::loadProfiles( const std::string& avProfilesPath )
-{	
+{
 	std::string realAvProfilesPath = avProfilesPath;
 	if( realAvProfilesPath.empty() )
 	{
@@ -47,7 +45,7 @@ void ProfileLoader::loadProfiles( const std::string& avProfilesPath )
 		else
 			realAvProfilesPath = AVTRANSCODER_DEFAULT_AVPROFILES;
 	}
-	
+
 	std::vector< std::string > paths;
 	split( paths, realAvProfilesPath, ":" );
 	for( std::vector< std::string >::iterator dirIt = paths.begin(); dirIt != paths.end(); ++dirIt )
diff --git a/src/AvTranscoder/profile/ProfileLoader.hpp b/src/AvTranscoder/profile/ProfileLoader.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_PROFILE_HPP_
 #define _AV_TRANSCODER_PROFILE_HPP_
 
-#include "common.hpp"
+#include <AvTranscoder/common.hpp>
 
 #include <string>
 #include <cstring>
diff --git a/src/AvTranscoder/profile/profile.i b/src/AvTranscoder/profile/profile.i
@@ -0,0 +1,11 @@
+%{
+#include <AvTranscoder/profile/ProfileLoader.hpp>
+%}
+
+namespace std {
+%template(IntPair)         pair< size_t, size_t >;
+%template(ProfileMap)      map< string, string >;
+%template(ProfilesVector)  vector< map< string, string > >;
+}
+
+%include <AvTranscoder/profile/ProfileLoader.hpp>
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -11,7 +11,7 @@
 
 #include <AvTranscoder/file/IOutputFile.hpp>
 
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -5,7 +5,7 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/IOutputFile.hpp>
 #include <AvTranscoder/stream/IInputStream.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 #include "StreamTranscoder.hpp"
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "IEncoder.hpp"`
`5`	`5`	`#include <AvTranscoder/codec/AudioCodec.hpp>`
`6`		`-#include <AvTranscoder/ProfileLoader.hpp>`
	`6`	`+#include <AvTranscoder/profile/ProfileLoader.hpp>`
`7`	`7`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "IEncoder.hpp"`
`5`	`5`	`#include <AvTranscoder/codec/VideoCodec.hpp>`
`6`		`-#include <AvTranscoder/ProfileLoader.hpp>`
	`6`	`+#include <AvTranscoder/profile/ProfileLoader.hpp>`
`7`	`7`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include <AvTranscoder/file/IOutputFile.hpp>`
`13`	`13`
`14`		`-#include <AvTranscoder/ProfileLoader.hpp>`
	`14`	`+#include <AvTranscoder/profile/ProfileLoader.hpp>`
`15`	`15`
`16`	`16`	`namespace avtranscoder`
`17`	`17`	`{`