OutputFile: symmetry between beginWrap & endWrap

Clement Champetier · Clement Champetier · commit b4d17c706e04 · 2015-04-24T17:23:24.000+02:00
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -15,7 +15,6 @@ OutputFile::OutputFile( const std::string& filename )
 	, _previousProcessedStreamDuration( 0.0 )
 {
 	_formatContext.setOutputFormat( _filename );
-	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
 }
 
 OutputFile::~OutputFile()
@@ -90,9 +89,12 @@ bool OutputFile::beginWrap( )
 {
 	LOG_DEBUG( "Begin wrap of OutputFile" )
 
+	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
 	_formatContext.writeHeader();
+
 	_frameCount.clear();
 	_frameCount.resize( _outputStreams.size(), 0 );
+
 	return true;
 }
 
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -33,8 +33,16 @@ class AvExport OutputFile : public IOutputFile
 	IOutputStream& addAudioStream( const AudioCodec& audioDesc );
 	IOutputStream& addDataStream( const DataCodec& dataDesc );
 
+	/**
+	 * @brief Open ressource and write header.
+         */
 	bool beginWrap();
+
 	IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamId );
+
+	/**
+	 * @brief Close ressource and write trailer.
+         */
 	bool endWrap();
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ OutputFile::OutputFile( const std::string& filename )`
`15`	`15`	`, _previousProcessedStreamDuration( 0.0 )`
`16`	`16`	`{`
`17`	`17`	`_formatContext.setOutputFormat( _filename );`
`18`		`- _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`OutputFile::~OutputFile()`
`@@ -90,9 +89,12 @@ bool OutputFile::beginWrap( )`
`90`	`89`	`{`
`91`	`90`	`LOG_DEBUG( "Begin wrap of OutputFile" )`
`92`	`91`
	`92`	`+ _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
`93`	`93`	`_formatContext.writeHeader();`
	`94`	`+`
`94`	`95`	`_frameCount.clear();`
`95`	`96`	`_frameCount.resize( _outputStreams.size(), 0 );`
	`97`	`+`
`96`	`98`	`return true;`
`97`	`99`	`}`
`98`	`100`