Merge remote-tracking branch 'van/dev_transcoder' into dev_streamsProcessor

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit ab93bddee36c · 2014-06-23T14:56:02.000-04:00
Conflicts:
	app/audioRewrapper/audioRewrapper.cpp
diff --git a/app/audioRewrapper/audioRewrapper.cpp b/app/audioRewrapper/audioRewrapper.cpp
@@ -21,12 +21,15 @@ void rewrapAudio( const char* inputfilename, const char* outputFilename )
 
 	InputFile inputFile( inputfilename );
 	inputFile.analyse( p );
+	inputFile.readStream( 0 );
 
 	OutputFile outputFile( outputFilename );
 
 	outputFile.setup();
 
 	outputFile.addAudioStream( inputFile.getStream( 0 ).getAudioDesc() );
+	
+	outputFile.beginWrap();
 
 	DataStream data;
 
@@ -43,6 +46,7 @@ void rewrapAudio( const char* inputfilename, const char* outputFilename )
 
 		++frame;
 	}
+	outputFile.endWrap();
 	std::cout << std::endl;
 }
 
@@ -133,8 +137,8 @@ int main( int argc, char** argv )
 
 	try
 	{
-		//rewrapAudio( argv[1], argv[2] );
-		transcodeAudio( argv[1], argv[2] );
+		rewrapAudio( argv[1], argv[2] );
+		// transcodeAudio( argv[1], argv[2] );
 	}
 	catch( std::exception &e )
 	{
diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
@@ -34,9 +34,24 @@ void Profile::loadProfiles()
 	{
 		std::vector< std::string > paths;
 		split( paths, envAvProfiles, ":" );
-		for( std::vector< std::string >::iterator it = paths.begin(); it != paths.end(); ++it )
+		for( std::vector< std::string >::iterator dirIt = paths.begin(); dirIt != paths.end(); ++dirIt )
 		{
-			std::cout << "search profile in path " << *it << std::endl;
+			//std::cout << "search profile in path " << *dirIt << std::endl;
+			std::vector< std::string > files;
+			if( getFilesInDir( *dirIt, files ) != 0 )
+				continue;
+
+			for( std::vector< std::string >::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt )
+			{
+				if( ( *fileIt == "." ) || ( *fileIt == ".." ) )
+					continue;
+
+				std::ifstream ifs;
+
+				ifs.open( ( *dirIt ) + ( *fileIt ), std::ifstream::in );
+
+				std::cout << "file " << *dirIt << *fileIt << std::endl;
+			}
 		}
 	}
 }
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -61,6 +61,8 @@ struct Ratio
 
 void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
 
+int getFilesInDir( std::string dir, std::vector< std::string > &files );
+
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,15 @@ void rewrapAudio( const char* inputfilename, const char* outputFilename )`
`21`	`21`
`22`	`22`	`InputFile inputFile( inputfilename );`
`23`	`23`	`inputFile.analyse( p );`
	`24`	`+ inputFile.readStream( 0 );`
`24`	`25`
`25`	`26`	`OutputFile outputFile( outputFilename );`
`26`	`27`
`27`	`28`	`outputFile.setup();`
`28`	`29`
`29`	`30`	`outputFile.addAudioStream( inputFile.getStream( 0 ).getAudioDesc() );`
	`31`	`+`
	`32`	`+ outputFile.beginWrap();`
`30`	`33`
`31`	`34`	`DataStream data;`
`32`	`35`
`@@ -43,6 +46,7 @@ void rewrapAudio( const char* inputfilename, const char* outputFilename )`
`43`	`46`
`44`	`47`	`++frame;`
`45`	`48`	`}`
	`49`	`+ outputFile.endWrap();`
`46`	`50`	`std::cout << std::endl;`
`47`	`51`	`}`
`48`	`52`
`@@ -133,8 +137,8 @@ int main( int argc, char** argv )`
`133`	`137`
`134`	`138`	`try`
`135`	`139`	`{`
`136`		`- //rewrapAudio( argv[1], argv[2] );`
`137`		`- transcodeAudio( argv[1], argv[2] );`
	`140`	`+ rewrapAudio( argv[1], argv[2] );`
	`141`	`+ // transcodeAudio( argv[1], argv[2] );`
`138`	`142`	`}`
`139`	`143`	`catch( std::exception &e )`
`140`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,24 @@ void Profile::loadProfiles()`
`34`	`34`	`{`
`35`	`35`	`std::vector< std::string > paths;`
`36`	`36`	`split( paths, envAvProfiles, ":" );`
`37`		`- for( std::vector< std::string >::iterator it = paths.begin(); it != paths.end(); ++it )`
	`37`	`+ for( std::vector< std::string >::iterator dirIt = paths.begin(); dirIt != paths.end(); ++dirIt )`
`38`	`38`	`{`
`39`		`- std::cout << "search profile in path " << *it << std::endl;`
	`39`	`+ //std::cout << "search profile in path " << *dirIt << std::endl;`
	`40`	`+ std::vector< std::string > files;`
	`41`	`+ if( getFilesInDir( *dirIt, files ) != 0 )`
	`42`	`+ continue;`
	`43`	`+`
	`44`	`+ for( std::vector< std::string >::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt )`
	`45`	`+ {`
	`46`	`+ if( ( fileIt == "." ) \|\| ( fileIt == ".." ) )`
	`47`	`+ continue;`
	`48`	`+`
	`49`	`+ std::ifstream ifs;`
	`50`	`+`
	`51`	`+ ifs.open( ( dirIt ) + ( fileIt ), std::ifstream::in );`
	`52`	`+`
	`53`	`+ std::cout << "file " << dirIt << fileIt << std::endl;`
	`54`	`+ }`
`40`	`55`	`}`
`41`	`56`	`}`
`42`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ struct Ratio`
`61`	`61`
`62`	`62`	`void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );`
`63`	`63`
	`64`	`+int getFilesInDir( std::string dir, std::vector< std::string > &files );`
	`65`	`+`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`#endif`