clean callback for java usage

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 7aa151f049aa · 2014-05-19T14:53:32.000-04:00
diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -32,20 +32,6 @@ void parseConfigFile( const std::string& configFilename, avtranscoder::Transcode
 	configFile.close();
 }
 
-avtranscoder::EJobStatus callBackProgress( const double processedDuration, const double programDuration )
-{
-	std::string progress( 80, '-' );
-	std::string done( 80.0 * processedDuration / programDuration, '#' );
-	progress.replace( 0, done.size(), done );
-
-	std::cout  << std::setprecision(2) << std::fixed << "\r[" << progress << "] " << processedDuration << "/" << programDuration << std::flush;
-
-	// if( processedFrames >= 100 )
-	// 	return avtranscoder::eJobStatusCancel;
-
-	return avtranscoder::eJobStatusContinue;
-}
-
 int main( int argc, char** argv )
 {
 	if( argc != 3 )
@@ -61,7 +47,7 @@ int main( int argc, char** argv )
 		std::cout << "start ..." << std::endl;
 
 		std::string inputConfigFile( argv[1] );
-		std::string outputFile( argv[2] );
+		avtranscoder::OutputFile outputFile( argv[2] );
 
 		avtranscoder::Transcoder::StreamsDefinition streams;
 
diff --git a/src/AvTranscoder/ProgressListener.hpp b/src/AvTranscoder/ProgressListener.hpp
@@ -1,6 +1,9 @@
 #ifndef _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
 #define _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
 
+#include <iostream>
+#include <iomanip>
+
 namespace avtranscoder
 {
 
@@ -21,7 +24,15 @@ class ProgressListener
 
 	virtual EJobStatus progress( const double processedDuration, const double programDuration )
 	{
-		std::cout << "c++ progress " << processedDuration << "/" << programDuration << std::endl;
+		std::string progress( 80, '-' );
+		std::string done( 80.0 * processedDuration / programDuration, '#' );
+		progress.replace( 0, done.size(), done );
+
+		std::cout  << std::setprecision(2) << std::fixed << "\r[" << progress << "] " << processedDuration << "/" << programDuration << std::flush;
+
+		// if( processedFrames >= 100 )
+		// 	return avtranscoder::eJobStatusCancel;
+
 		return eJobStatusContinue;
 	}
 };
diff --git a/src/AvTranscoder/Transcoder.hpp b/src/AvTranscoder/Transcoder.hpp
@@ -17,8 +17,7 @@ class Transcoder
 public:
 	typedef std::vector< std::pair< std::string, size_t > > StreamsDefinition;
 
-	Transcoder( const std::string& filename );
-	Transcoder( OutputFile* outputFile );
+	Transcoder( OutputFile& outputFile );
 
 	~Transcoder();
 
@@ -29,7 +28,7 @@ class Transcoder
 	void process( ProgressListener& progress );
 
 private:
-	OutputFile*                _outputFile;
+	OutputFile&                _outputFile;
 	std::vector< InputStream > _inputStreams;
 };
 
diff --git a/src/AvTranscoder/Transcoder.tcc b/src/AvTranscoder/Transcoder.tcc
@@ -3,24 +3,14 @@
 namespace avtranscoder
 {
 
-Transcoder::Transcoder( const std::string& filename )
-	: _outputFile( NULL )
+Transcoder::Transcoder( OutputFile& outputFile )
+	: _outputFile( outputFile )
 {
-	_outputFile = new OutputFile( filename );
-	_outputFile->setup();
-}
-
-Transcoder::Transcoder( OutputFile* outputFile )
-	: _outputFile( NULL )
-{
-	_outputFile = outputFile;
-	_outputFile->setup();
+	_outputFile.setup();
 }
 
 Transcoder::~Transcoder()
 {
-	delete _outputFile;
-	_outputFile = NULL;
 }
 
 void Transcoder::add( const std::string& filename, const size_t streamIndex )
@@ -32,13 +22,13 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex )
 		case AVMEDIA_TYPE_VIDEO:
 		{
 			_inputStreams.push_back( avtranscoder::InputStream( filename, streamIndex ) );
-			_outputFile->addVideoStream( _inputStreams.back().getVideoDesc() );
+			_outputFile.addVideoStream( _inputStreams.back().getVideoDesc() );
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
 			_inputStreams.push_back( avtranscoder::InputStream( filename, streamIndex ) );
-			_outputFile->addAudioStream( _inputStreams.back().getAudioDesc() );
+			_outputFile.addAudioStream( _inputStreams.back().getAudioDesc() );
 			break;
 		}
 		case AVMEDIA_TYPE_DATA:
@@ -75,7 +65,7 @@ void Transcoder::process( ProgressListener& progress )
 		dataStreams.push_back( dataStream );
 	}
 
-	_outputFile->beginWrap();
+	_outputFile.beginWrap();
 
 	bool continueProcess( true );
 
@@ -111,13 +101,13 @@ void Transcoder::process( ProgressListener& progress )
 
 		for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )
 		{
-			_outputFile->wrap( dataStreams.at( streamIndex ), streamIndex );
+			_outputFile.wrap( dataStreams.at( streamIndex ), streamIndex );
 		}
 
 		++frame;
 	}
 
-	_outputFile->endWrap();
+	_outputFile.endWrap();
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,24 +3,14 @@`
`3`	`3`	`namespace avtranscoder`
`4`	`4`	`{`
`5`	`5`
`6`		`-Transcoder::Transcoder( const std::string& filename )`
`7`		`- : _outputFile( NULL )`
	`6`	`+Transcoder::Transcoder( OutputFile& outputFile )`
	`7`	`+ : _outputFile( outputFile )`
`8`	`8`	`{`
`9`		`- _outputFile = new OutputFile( filename );`
`10`		`- _outputFile->setup();`
`11`		`-}`
`12`		`-`
`13`		`-Transcoder::Transcoder( OutputFile* outputFile )`
`14`		`- : _outputFile( NULL )`
`15`		`-{`
`16`		`- _outputFile = outputFile;`
`17`		`- _outputFile->setup();`
	`9`	`+ _outputFile.setup();`
`18`	`10`	`}`
`19`	`11`
`20`	`12`	`Transcoder::~Transcoder()`
`21`	`13`	`{`
`22`		`- delete _outputFile;`
`23`		`- _outputFile = NULL;`
`24`	`14`	`}`
`25`	`15`
`26`	`16`	`void Transcoder::add( const std::string& filename, const size_t streamIndex )`
`@@ -32,13 +22,13 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex )`
`32`	`22`	`case AVMEDIA_TYPE_VIDEO:`
`33`	`23`	`{`
`34`	`24`	`_inputStreams.push_back( avtranscoder::InputStream( filename, streamIndex ) );`
`35`		`- _outputFile->addVideoStream( _inputStreams.back().getVideoDesc() );`
	`25`	`+ _outputFile.addVideoStream( _inputStreams.back().getVideoDesc() );`
`36`	`26`	`break;`
`37`	`27`	`}`
`38`	`28`	`case AVMEDIA_TYPE_AUDIO:`
`39`	`29`	`{`
`40`	`30`	`_inputStreams.push_back( avtranscoder::InputStream( filename, streamIndex ) );`
`41`		`- _outputFile->addAudioStream( _inputStreams.back().getAudioDesc() );`
	`31`	`+ _outputFile.addAudioStream( _inputStreams.back().getAudioDesc() );`
`42`	`32`	`break;`
`43`	`33`	`}`
`44`	`34`	`case AVMEDIA_TYPE_DATA:`
`@@ -75,7 +65,7 @@ void Transcoder::process( ProgressListener& progress )`
`75`	`65`	`dataStreams.push_back( dataStream );`
`76`	`66`	`}`
`77`	`67`
`78`		`- _outputFile->beginWrap();`
	`68`	`+ _outputFile.beginWrap();`
`79`	`69`
`80`	`70`	`bool continueProcess( true );`
`81`	`71`
`@@ -111,13 +101,13 @@ void Transcoder::process( ProgressListener& progress )`
`111`	`101`
`112`	`102`	`for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )`
`113`	`103`	`{`
`114`		`- _outputFile->wrap( dataStreams.at( streamIndex ), streamIndex );`
	`104`	`+ _outputFile.wrap( dataStreams.at( streamIndex ), streamIndex );`
`115`	`105`	`}`
`116`	`106`
`117`	`107`	`++frame;`
`118`	`108`	`}`
`119`	`109`
`120`		`- _outputFile->endWrap();`
	`110`	`+ _outputFile.endWrap();`
`121`	`111`
`122`	`112`	`}`
`123`	`113`