unify split char* and start to get env for profiles

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e3a4851b2c23 · 2014-06-23T09:30:45.000-04:00
diff --git a/src/AvTranscoder/Description.hpp b/src/AvTranscoder/Description.hpp
@@ -13,6 +13,8 @@ extern "C" {
 #include <cstring>
 #include <algorithm> //sort, unique
 
+#include "common.hpp"
+
 namespace avtranscoder
 {
 
@@ -38,23 +40,11 @@ std::vector<std::string> getInputExtensions()
 		if( iFormat->extensions != NULL )
 		{
 			// parse extensions
-			std::string exts = std::string( iFormat->extensions );
-			char* ext = strtok( const_cast<char*>( exts.c_str() ), "," );
-			while( ext != NULL )
-			{
-				extensions.push_back( std::string( ext ) );
-				ext = strtok( NULL, "," );
-			}
+			split( extensions, std::string( iFormat->extensions ), "," );
 			
 			// parse name (name's format defines (in general) extensions )
 			// don't need to do it in recent LibAV/FFMpeg versions
-			exts = std::string( iFormat->name );
-			ext = strtok( const_cast<char*>( exts.c_str() ), "," );
-			while( ext != NULL )
-			{
-				extensions.push_back( std::string( ext ) );
-				ext = strtok( NULL, "," );
-			}
+			split( extensions, std::string( iFormat->name ), "," );
 		}
 	}
 	// sort
@@ -77,23 +67,11 @@ std::vector<std::string> getOutputExtensions()
 		if( oFormat->extensions != NULL )
 		{			
 			// parse extensions
-			std::string exts = std::string( oFormat->extensions );
-			char* ext = strtok( const_cast<char*>( exts.c_str() ), "," );
-			while( ext != NULL )
-			{
-				extensions.push_back( std::string( ext ) );
-				ext = strtok( NULL, "," );
-			}
+			split( extensions, std::string( oFormat->extensions ), "," );
 			
 			// parse name (name's format defines (in general) extensions )
 			// don't need to do it in recent LibAV/FFMpeg versions
-			exts = std::string( oFormat->name );
-			ext = strtok( const_cast<char*>( exts.c_str() ), "," );
-			while( ext != NULL )
-			{
-				extensions.push_back( std::string( ext ) );
-				ext = strtok( NULL, "," );
-			}
+			split( extensions, std::string( oFormat->name ), "," );
 		}
 	}
 	// sort
diff --git a/src/AvTranscoder/OutputStreamAudio.cpp b/src/AvTranscoder/OutputStreamAudio.cpp
@@ -169,7 +169,7 @@ bool OutputStreamAudio::encodeFrame( DataStream& codedFrame )
 void OutputStreamAudio::setProfile( const std::string& profile )
 {
 	Profile p;
-	p.loadAudioProfiles();
+	p.loadProfiles();
 	Profile::ProfileDesc profDesc = p.getProfile( profile );
 
 	_audioDesc.setAudioCodec( profDesc["codec"] );
diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
@@ -1,9 +1,14 @@
 #include "Profile.hpp"
 
+#include <AvTranscoder/common.hpp>
+
 #include <AvTranscoder/Profiles/XdCamHd422.hpp>
 #include <AvTranscoder/Profiles/DNxHD.hpp>
 #include <AvTranscoder/Profiles/Wave.hpp>
 
+#include <iostream>
+#include <cstdlib>
+
 namespace avtranscoder
 {
 
@@ -23,11 +28,17 @@ void Profile::loadProfiles()
 {
 	loadXdCamHD422( _profiles );
 	loadDNxHD( _profiles );
-}
-
-void Profile::loadAudioProfiles()
-{
 	loadWave( _profiles );
+
+	if( const char* envAvProfiles = std::getenv("AVPROFILES") )
+	{
+		std::vector< std::string > paths;
+		split( paths, envAvProfiles, ";" );
+		for( std::vector< std::string >::iterator it = paths.begin(); it != paths.end(); ++it )
+		{
+			std::cout << "search profile in path " << *it << std::endl;
+		}
+	}
 }
 
 const Profile::ProfilesDesc& Profile::getProfiles()
@@ -39,6 +50,12 @@ Profile::ProfilesDesc Profile::getVideoProfiles()
 {
 	ProfilesDesc profiles;
 
+	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
+	{
+		if( (*it).find( avProfilType )->second == avProfilTypeVideo )
+			profiles.push_back( *it );
+	}
+
 	return profiles;
 }
 
@@ -53,7 +70,7 @@ Profile::ProfileDesc& Profile::getProfile( const std::string& searchProfile )
 {
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it)["avProfile"] == searchProfile )
+		if( (*it).find( avProfilIdentificator )->second == searchProfile )
 		{
 			return (*it);
 		}
diff --git a/src/AvTranscoder/Profile.hpp b/src/AvTranscoder/Profile.hpp
@@ -26,7 +26,6 @@ class Profile
 	Profile();
 
 	void loadProfiles();
-	void loadAudioProfiles();
 
 	const ProfilesDesc& getProfiles();
 
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -15,6 +15,8 @@ extern "C" {
 }
 
 #include <string>
+#include <cstring>
+#include <vector>
 
 #ifdef SWIG
  #define AvExport
@@ -57,6 +59,8 @@ struct Ratio
 	size_t den;
 };
 
+void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
+
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ bool OutputStreamAudio::encodeFrame( DataStream& codedFrame )`
`169`	`169`	`void OutputStreamAudio::setProfile( const std::string& profile )`
`170`	`170`	`{`
`171`	`171`	`Profile p;`
`172`		`- p.loadAudioProfiles();`
	`172`	`+ p.loadProfiles();`
`173`	`173`	`Profile::ProfileDesc profDesc = p.getProfile( profile );`
`174`	`174`
`175`	`175`	`_audioDesc.setAudioCodec( profDesc["codec"] );`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ extern "C" {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`#include <string>`
	`18`	`+#include <cstring>`
	`19`	`+#include <vector>`
`18`	`20`
`19`	`21`	`#ifdef SWIG`
`20`	`22`	`#define AvExport`
`@@ -57,6 +59,8 @@ struct Ratio`
`57`	`59`	`size_t den;`
`58`	`60`	`};`
`59`	`61`
	`62`	`+void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );`
	`63`	`+`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`#endif`