IOutputFile: remove setup function

Clement Champetier · Clement Champetier · commit 7cee053a939f · 2015-02-10T14:12:24.000+01:00
Call the instructions in constructor of OutputFile.
SetProfile only one time in setProfile method.
diff --git a/src/AvTranscoder/file/IOutputFile.hpp b/src/AvTranscoder/file/IOutputFile.hpp
@@ -25,11 +25,6 @@ class AvExport IOutputFile
 public:
 	virtual ~IOutputFile() {};
 
-	/**
-	 * @brief Initialize the wrapper
-	**/
-	virtual bool setup() = 0;
-
 	/**
 	 * @brief Add a video output stream
 	 * @note call setup() before adding any stream
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -15,7 +15,10 @@ OutputFile::OutputFile( const std::string& filename )
 	, _filename( filename )
 	, _previousProcessedStreamDuration( 0.0 )
 	, _verbose( false )
-{}
+{
+	_formatContext.setOutputFormat( _filename );
+	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
+}
 
 OutputFile::~OutputFile()
 {
@@ -25,13 +28,6 @@ OutputFile::~OutputFile()
 	}
 }
 
-bool OutputFile::setup()
-{
-	_formatContext.setOutputFormat( _filename );
-	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
-	return true;
-}
-
 IOutputStream& OutputFile::addVideoStream( const VideoCodec& videoDesc )
 {
 	AVStream& stream = _formatContext.addAVStream( videoDesc.getAVCodec() );
@@ -157,32 +153,16 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )
 
 void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 {
+	// check if output format indicated is valid with the filename extension
 	if( ! matchFormat( profile.find( constants::avProfileFormat )->second, _filename ) )
 	{
 		throw std::runtime_error( "Invalid format according to the file extension." );
 	}
-	
+
+	// set output format
 	_formatContext.setOutputFormat( _filename, profile.find( constants::avProfileFormat )->second );
-	
-	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
-	{
-		if( (*it).first == constants::avProfileIdentificator ||
-			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileFormat )
-			continue;
-		
-		try
-		{
-			Option& formatOption = _formatContext.getOption( (*it).first );
-			formatOption.setString( (*it).second );
-		}
-		catch( std::exception& e )
-		{}
-	}
-	
-	setup();
-	
+
+	// set format options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
@@ -198,8 +178,7 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 		}
 		catch( std::exception& e )
 		{
-			if( _verbose )
-				std::cout << "[OutputFile] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+			std::cout << "[OutputFile] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -25,13 +25,6 @@ class AvExport OutputFile : public IOutputFile
 
 	~OutputFile();
 
-	/**
-	 * @brief Initialize the OutputFile, create format context to wrap essences into output file.
-	 * @note call this before adding streams using addVideoStream() or addAudioStream()
-	 * @exception ios_base::failure launched if unable to guess format or open output
-	**/
-	bool setup();
-
 	IOutputStream& addVideoStream( const VideoCodec& videoDesc );
 	IOutputStream& addAudioStream( const AudioCodec& audioDesc );
 	IOutputStream& addDataStream( const DataCodec& dataDesc );
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -22,9 +22,6 @@ Transcoder::Transcoder( IOutputFile& outputFile )
 	, _outputDuration( 0 )
 	, _verbose( false )
 {
-	// Initialize the OutputFile
-	_outputFile.setup();
-
 	// Print no output from ffmpeg
 	av_log_set_level( AV_LOG_QUIET );
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,10 @@ OutputFile::OutputFile( const std::string& filename )`
`15`	`15`	`, _filename( filename )`
`16`	`16`	`, _previousProcessedStreamDuration( 0.0 )`
`17`	`17`	`, _verbose( false )`
`18`		`-{}`
	`18`	`+{`
	`19`	`+ _formatContext.setOutputFormat( _filename );`
	`20`	`+ _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
	`21`	`+}`
`19`	`22`
`20`	`23`	`OutputFile::~OutputFile()`
`21`	`24`	`{`
`@@ -25,13 +28,6 @@ OutputFile::~OutputFile()`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`
`28`		`-bool OutputFile::setup()`
`29`		`-{`
`30`		`- _formatContext.setOutputFormat( _filename );`
`31`		`- _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
`32`		`- return true;`
`33`		`-}`
`34`		`-`
`35`	`31`	`IOutputStream& OutputFile::addVideoStream( const VideoCodec& videoDesc )`
`36`	`32`	`{`
`37`	`33`	`AVStream& stream = _formatContext.addAVStream( videoDesc.getAVCodec() );`
`@@ -157,32 +153,16 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )`
`157`	`153`
`158`	`154`	`void OutputFile::setProfile( const ProfileLoader::Profile& profile )`
`159`	`155`	`{`
	`156`	`+ // check if output format indicated is valid with the filename extension`
`160`	`157`	`if( ! matchFormat( profile.find( constants::avProfileFormat )->second, _filename ) )`
`161`	`158`	`{`
`162`	`159`	`throw std::runtime_error( "Invalid format according to the file extension." );`
`163`	`160`	`}`
`164`		`-`
	`161`	`+`
	`162`	`+ // set output format`
`165`	`163`	`_formatContext.setOutputFormat( _filename, profile.find( constants::avProfileFormat )->second );`
`166`		`-`
`167`		`- for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
`168`		`- {`
`169`		`- if( (*it).first == constants::avProfileIdentificator \|\|`
`170`		`- (*it).first == constants::avProfileIdentificatorHuman \|\|`
`171`		`- (*it).first == constants::avProfileType \|\|`
`172`		`- (*it).first == constants::avProfileFormat )`
`173`		`- continue;`
`174`		`-`
`175`		`- try`
`176`		`- {`
`177`		`- Option& formatOption = _formatContext.getOption( (*it).first );`
`178`		`- formatOption.setString( (*it).second );`
`179`		`- }`
`180`		`- catch( std::exception& e )`
`181`		`- {}`
`182`		`- }`
`183`		`-`
`184`		`- setup();`
`185`		`-`
	`164`	`+`
	`165`	`+ // set format options`
`186`	`166`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
`187`	`167`	`{`
`188`	`168`	`if( (*it).first == constants::avProfileIdentificator \|\|`
`@@ -198,8 +178,7 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )`
`198`	`178`	`}`
`199`	`179`	`catch( std::exception& e )`
`200`	`180`	`{`
`201`		`- if( _verbose )`
`202`		`- std::cout << "[OutputFile] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
	`181`	`+ std::cout << "[OutputFile] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
`203`	`182`	`}`
`204`	`183`	`}`
`205`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@ Transcoder::Transcoder( IOutputFile& outputFile )`
`22`	`22`	`, _outputDuration( 0 )`
`23`	`23`	`, _verbose( false )`
`24`	`24`	`{`
`25`		`- // Initialize the OutputFile`
`26`		`- _outputFile.setup();`
`27`		`-`
`28`	`25`	`// Print no output from ffmpeg`
`29`	`26`	`av_log_set_level( AV_LOG_QUIET );`
`30`	`27`	`}`