InputFile: rename getFormatContext to getAVFormatContext

Clement Champetier · Clement Champetier · commit 3256bee37f3b · 2015-01-12T10:16:09.000+01:00
Prefix "AV" to functions which call libav functions.
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -68,7 +68,7 @@ void optionChecker( const std::string& inputfilename )
 	avtranscoder::InputFile file( inputfilename );
 
 	// format options
-	avtranscoder::Context formatContext( &file.getFormatContext() );
+	avtranscoder::Context formatContext( &file.getAVFormatContext() );
 	std::vector<avtranscoder::Option> formatOptions = formatContext.getOptions();
 	displayOptions( formatOptions );
 
diff --git a/src/AvTranscoder/codedStream/AvInputStream.cpp b/src/AvTranscoder/codedStream/AvInputStream.cpp
@@ -21,7 +21,7 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 	, _streamIndex( streamIndex )
 	, _isActivated( false )
 {
-	AVCodecContext* context = _inputFile->getFormatContext().streams[_streamIndex]->codec;
+	AVCodecContext* context = _inputFile->getAVFormatContext().streams[_streamIndex]->codec;
 
 	switch( context->codec_type )
 	{
@@ -102,7 +102,7 @@ void AvInputStream::addPacket( AVPacket& packet )
 
 VideoCodec& AvInputStream::getVideoCodec()
 {
-	assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );
+	assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );
 
 	if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_VIDEO )
 	{
@@ -114,7 +114,7 @@ VideoCodec& AvInputStream::getVideoCodec()
 
 AudioCodec& AvInputStream::getAudioCodec()
 {
-	assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );
+	assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );
 
 	if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_AUDIO )
 	{
@@ -126,7 +126,7 @@ AudioCodec& AvInputStream::getAudioCodec()
 
 DataCodec& AvInputStream::getDataCodec()
 {
-	assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );
+	assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );
 
 	if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_DATA )
 	{
@@ -143,7 +143,7 @@ AVMediaType AvInputStream::getStreamType() const
 
 double AvInputStream::getDuration() const
 {
-	return 1.0 * _inputFile->getFormatContext().duration / AV_TIME_BASE;
+	return 1.0 * _inputFile->getAVFormatContext().duration / AV_TIME_BASE;
 }
 
 void AvInputStream::clearBuffering()
@@ -153,7 +153,7 @@ void AvInputStream::clearBuffering()
 
 AVStream* AvInputStream::getAVStream() const
 {
-	return _inputFile->getFormatContext().streams[_streamIndex];
+	return _inputFile->getAVFormatContext().streams[_streamIndex];
 }
 
 }
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -74,7 +74,7 @@ class AvExport InputFile
 	 * @brief Get LibAV/FFmpeg AVFormatContext
 	 * @return format context on current InputFile
 	 **/
-	AVFormatContext& getFormatContext() const { return *_formatContext; }
+	AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 
 	/**
 	 * @brief Read the next packet of the specified stream

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )`
`21`	`21`	`, _streamIndex( streamIndex )`
`22`	`22`	`, _isActivated( false )`
`23`	`23`	`{`
`24`		`- AVCodecContext* context = _inputFile->getFormatContext().streams[_streamIndex]->codec;`
	`24`	`+ AVCodecContext* context = _inputFile->getAVFormatContext().streams[_streamIndex]->codec;`
`25`	`25`
`26`	`26`	`switch( context->codec_type )`
`27`	`27`	`{`
`@@ -102,7 +102,7 @@ void AvInputStream::addPacket( AVPacket& packet )`
`102`	`102`
`103`	`103`	`VideoCodec& AvInputStream::getVideoCodec()`
`104`	`104`	`{`
`105`		`- assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );`
	`105`	`+ assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );`
`106`	`106`
`107`	`107`	`if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_VIDEO )`
`108`	`108`	`{`
`@@ -114,7 +114,7 @@ VideoCodec& AvInputStream::getVideoCodec()`
`114`	`114`
`115`	`115`	`AudioCodec& AvInputStream::getAudioCodec()`
`116`	`116`	`{`
`117`		`- assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );`
	`117`	`+ assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );`
`118`	`118`
`119`	`119`	`if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_AUDIO )`
`120`	`120`	`{`
`@@ -126,7 +126,7 @@ AudioCodec& AvInputStream::getAudioCodec()`
`126`	`126`
`127`	`127`	`DataCodec& AvInputStream::getDataCodec()`
`128`	`128`	`{`
`129`		`- assert( _streamIndex <= _inputFile->getFormatContext().nb_streams );`
	`129`	`+ assert( _streamIndex <= _inputFile->getAVFormatContext().nb_streams );`
`130`	`130`
`131`	`131`	`if( getAVStream()->codec->codec_type != AVMEDIA_TYPE_DATA )`
`132`	`132`	`{`
`@@ -143,7 +143,7 @@ AVMediaType AvInputStream::getStreamType() const`
`143`	`143`
`144`	`144`	`double AvInputStream::getDuration() const`
`145`	`145`	`{`
`146`		`- return 1.0 * _inputFile->getFormatContext().duration / AV_TIME_BASE;`
	`146`	`+ return 1.0 * _inputFile->getAVFormatContext().duration / AV_TIME_BASE;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void AvInputStream::clearBuffering()`
`@@ -153,7 +153,7 @@ void AvInputStream::clearBuffering()`
`153`	`153`
`154`	`154`	`AVStream* AvInputStream::getAVStream() const`
`155`	`155`	`{`
`156`		`- return _inputFile->getFormatContext().streams[_streamIndex];`
	`156`	`+ return _inputFile->getAVFormatContext().streams[_streamIndex];`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`}`