Rename AvInput/OutputStream to Input/OutputStream

Clement Champetier · Clement Champetier · commit cf55ebadbc2b · 2015-01-12T18:06:20.000+01:00
Keep 'AV' prefix for ffmpeg/libav objects.
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -21,10 +21,10 @@
 #include <AvTranscoder/codec/DataCodec.hpp>
 
 #include <AvTranscoder/codedStream/IOutputStream.hpp>
-#include <AvTranscoder/codedStream/AvOutputStream.hpp>
+#include <AvTranscoder/codedStream/OutputStream.hpp>
 
 #include <AvTranscoder/codedStream/IInputStream.hpp>
-#include <AvTranscoder/codedStream/AvInputStream.hpp>
+#include <AvTranscoder/codedStream/InputStream.hpp>
 
 #include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
@@ -49,10 +49,10 @@ namespace std {
 %include <AvTranscoder/codec/DataCodec.hpp>
 
 %include <AvTranscoder/codedStream/IOutputStream.hpp>
-%include <AvTranscoder/codedStream/AvOutputStream.hpp>
+%include <AvTranscoder/codedStream/OutputStream.hpp>
 
 %include <AvTranscoder/codedStream/IInputStream.hpp>
-%include <AvTranscoder/codedStream/AvInputStream.hpp>
+%include <AvTranscoder/codedStream/InputStream.hpp>
 
 %include "AvTranscoder/decoder/decoder.i"
 %include "AvTranscoder/encoder/encoder.i"
diff --git a/src/AvTranscoder/codedStream/InputStream.cpp b/src/AvTranscoder/codedStream/InputStream.cpp
@@ -1,4 +1,4 @@
-#include "AvInputStream.hpp"
+#include "InputStream.hpp"
 
 #include <AvTranscoder/file/InputFile.hpp>
 
@@ -13,7 +13,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
+InputStream::InputStream( InputFile& inputFile, const size_t streamIndex )
 	: IInputStream( )
 	, _inputFile( &inputFile )
 	, _codec( NULL )
@@ -54,7 +54,7 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 	}
 }
 
-AvInputStream::AvInputStream( const AvInputStream& inputStream )
+InputStream::InputStream( const InputStream& inputStream )
 	: IInputStream( )
 	, _inputFile( inputStream._inputFile )
 	, _codec( inputStream._codec )
@@ -64,12 +64,12 @@ AvInputStream::AvInputStream( const AvInputStream& inputStream )
 {
 }
 
-AvInputStream::~AvInputStream( )
+InputStream::~InputStream( )
 {
 	delete _codec;
 }
 
-bool AvInputStream::readNextPacket( CodedData& data )
+bool InputStream::readNextPacket( CodedData& data )
 {
 	if( ! _isActivated )
 		throw std::runtime_error( "Can't read packet on non-activated input stream." );
@@ -89,7 +89,7 @@ bool AvInputStream::readNextPacket( CodedData& data )
 	return true;
 }
 
-VideoCodec& AvInputStream::getVideoCodec()
+VideoCodec& InputStream::getVideoCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
@@ -101,7 +101,7 @@ VideoCodec& AvInputStream::getVideoCodec()
 	return *static_cast<VideoCodec*>( _codec );;
 }
 
-AudioCodec& AvInputStream::getAudioCodec()
+AudioCodec& InputStream::getAudioCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
@@ -113,7 +113,7 @@ AudioCodec& AvInputStream::getAudioCodec()
 	return *static_cast<AudioCodec*>( _codec );;
 }
 
-DataCodec& AvInputStream::getDataCodec()
+DataCodec& InputStream::getDataCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
@@ -125,17 +125,17 @@ DataCodec& AvInputStream::getDataCodec()
 	return *static_cast<DataCodec*>( _codec );;
 }
 
-AVMediaType AvInputStream::getStreamType() const
+AVMediaType InputStream::getStreamType() const
 {
 	return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;
 }
 
-double AvInputStream::getDuration() const
+double InputStream::getDuration() const
 {
 	return 1.0 * _inputFile->getFormatContext().getDuration() / AV_TIME_BASE;
 }
 
-void AvInputStream::addPacket( AVPacket& packet )
+void InputStream::addPacket( AVPacket& packet )
 {
 	// Do not cache data if the stream is declared as unused in process
 	if( ! _isActivated )
@@ -146,7 +146,7 @@ void AvInputStream::addPacket( AVPacket& packet )
 	_streamCache.back().copyData( packet.data, packet.size );
 }
 
-void AvInputStream::clearBuffering()
+void InputStream::clearBuffering()
 {
 	_streamCache = std::queue<CodedData>();
 }
diff --git a/src/AvTranscoder/codedStream/InputStream.hpp b/src/AvTranscoder/codedStream/InputStream.hpp
@@ -12,12 +12,12 @@ namespace avtranscoder
 
 class InputFile;
 
-class AvExport AvInputStream : public IInputStream
+class AvExport InputStream : public IInputStream
 {
 public:
-	AvInputStream( InputFile& inputFile, const size_t streamIndex );
-	AvInputStream( const AvInputStream& inputStream );  ///< Does not copy _streamCache
-	~AvInputStream( );
+	InputStream( InputFile& inputFile, const size_t streamIndex );
+	InputStream( const InputStream& inputStream );  ///< Does not copy _streamCache
+	~InputStream( );
 
 	bool readNextPacket( CodedData& data );
 
diff --git a/src/AvTranscoder/codedStream/OutputStream.cpp b/src/AvTranscoder/codedStream/OutputStream.cpp
@@ -1,4 +1,4 @@
-#include "AvOutputStream.hpp"
+#include "OutputStream.hpp"
 
 #include <AvTranscoder/file/OutputFile.hpp>
 
@@ -7,14 +7,14 @@
 namespace avtranscoder
 {
 
-AvOutputStream::AvOutputStream( OutputFile& outputFile, const size_t streamIndex )
+OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 	: IOutputStream()
 	, _outputFile( &outputFile )
 	, _streamIndex( streamIndex )
 {
 }
 
-IOutputStream::EWrappingStatus AvOutputStream::wrap( const CodedData& data )
+IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )
 {
 	assert( _outputFile != NULL );
 	return _outputFile->wrap( data, _streamIndex );
diff --git a/src/AvTranscoder/codedStream/OutputStream.hpp b/src/AvTranscoder/codedStream/OutputStream.hpp
@@ -8,10 +8,10 @@ namespace avtranscoder
 
 class OutputFile;
 
-class AvExport AvOutputStream : public IOutputStream
+class AvExport OutputStream : public IOutputStream
 {
 public:
-	AvOutputStream( OutputFile& outputFile, const size_t streamIndex );
+	OutputStream( OutputFile& outputFile, const size_t streamIndex );
 
 	size_t getStreamIndex() const { return _streamIndex; }
 
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -1,7 +1,7 @@
 #include "AudioDecoder.hpp"
 
 #include <AvTranscoder/codec/ICodec.hpp>
-#include <AvTranscoder/codedStream/AvInputStream.hpp>
+#include <AvTranscoder/codedStream/InputStream.hpp>
 #include <AvTranscoder/frame/AudioFrame.hpp>
 
 extern "C" {
@@ -18,7 +18,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioDecoder::AudioDecoder( AvInputStream& inputStream ) 
+AudioDecoder::AudioDecoder( InputStream& inputStream ) 
 	: _inputStream   ( &inputStream )
 	, _frame         ( NULL )
 {
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -8,12 +8,12 @@ struct AVFrame;
 namespace avtranscoder
 {
 
-class AvInputStream;
+class InputStream;
 
 class AvExport AudioDecoder : public IDecoder
 {
 public:
-	AudioDecoder( AvInputStream& inputStream );
+	AudioDecoder( InputStream& inputStream );
 	~AudioDecoder();
 
 	void setup();
@@ -25,7 +25,7 @@ class AvExport AudioDecoder : public IDecoder
 	bool decodeNextFrame();
 
 private:
-	AvInputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
+	InputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
 	AVFrame* _frame;  ///< Libav object to store decoded data (has ownership)
 };
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -1,7 +1,7 @@
 #include "VideoDecoder.hpp"
 
 #include <AvTranscoder/codec/ICodec.hpp>
-#include <AvTranscoder/codedStream/AvInputStream.hpp>
+#include <AvTranscoder/codedStream/InputStream.hpp>
 #include <AvTranscoder/frame/VideoFrame.hpp>
 
 extern "C" {
@@ -17,7 +17,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-VideoDecoder::VideoDecoder( AvInputStream& inputStream )
+VideoDecoder::VideoDecoder( InputStream& inputStream )
 	: _inputStream   ( &inputStream )
 	, _frame         ( NULL )
 {
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -9,12 +9,12 @@ struct AVFrame;
 namespace avtranscoder
 {
 
-class AvInputStream;
+class InputStream;
 
 class AvExport VideoDecoder : public IDecoder
 {
 public:
-	VideoDecoder( AvInputStream& inputStream );
+	VideoDecoder( InputStream& inputStream );
 	~VideoDecoder();
 	
 	void setup();
@@ -30,7 +30,7 @@ class AvExport VideoDecoder : public IDecoder
 	bool decodeNextFrame();
 
 private:
-	AvInputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
+	InputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
 	AVFrame* _frame;  ///< Libav object to store decoded data (has ownership)
 };
 
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -31,13 +31,13 @@ InputFile::InputFile( const std::string& filename )
 	// Create streams
 	for( size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex )
 	{
-		_inputStreams.push_back( new AvInputStream( *this, streamIndex ) );
+		_inputStreams.push_back( new InputStream( *this, streamIndex ) );
 	}
 }
 
 InputFile::~InputFile()
 {
-	for( std::vector< AvInputStream* >::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
+	for( std::vector< InputStream* >::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
 	{
 		delete (*it);
 	}
@@ -149,7 +149,7 @@ void InputFile::seekAtFrame( const size_t frame )
 		std::cerr << "Error during seek at " << frame << " (" << pos << ") in file" << std::endl;
 	}
 
-	for( std::vector<AvInputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
+	for( std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
 	{
 		(*it)->clearBuffering();
 	}
@@ -160,7 +160,7 @@ void InputFile::activateStream( const size_t streamIndex, bool activate )
 	getStream( streamIndex ).activate( activate );
 }
 
-AvInputStream& InputFile::getStream( size_t index )
+InputStream& InputFile::getStream( size_t index )
 {
 	try
 	{
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -4,7 +4,7 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/option/FormatContext.hpp>
 #include <AvTranscoder/file/util.hpp>
-#include <AvTranscoder/codedStream/AvInputStream.hpp>
+#include <AvTranscoder/codedStream/InputStream.hpp>
 #include <AvTranscoder/mediaProperty/FileProperties.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
@@ -72,7 +72,7 @@ class AvExport InputFile
 	 * @param index stream index
 	 * @return media stream type of specified index stream
 	 **/
-	AvInputStream& getStream( size_t index );
+	InputStream& getStream( size_t index );
 
 	FormatContext& getFormatContext() { return _formatContext; }
 
@@ -100,7 +100,7 @@ class AvExport InputFile
 	FormatContext _formatContext;
 	FileProperties _properties;
 	std::string _filename;
-	std::vector<AvInputStream*> _inputStreams;
+	std::vector<InputStream*> _inputStreams;
 
 	bool _verbose;
 };
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -45,7 +45,7 @@ IOutputStream& OutputFile::addVideoStream( const VideoCodec& videoDesc )
 
 	stream.time_base = stream.codec->time_base;
 
-	AvOutputStream* avOutputStream = new AvOutputStream( *this, _formatContext.getNbStreams() - 1 );
+	OutputStream* avOutputStream = new OutputStream( *this, _formatContext.getNbStreams() - 1 );
 	_outputStreams.push_back( avOutputStream );
 
 	return *_outputStreams.back();
@@ -59,7 +59,7 @@ IOutputStream& OutputFile::addAudioStream( const AudioCodec& audioDesc )
 	stream.codec->channels = audioDesc.getAVCodecContext().channels;
 	stream.codec->sample_fmt = audioDesc.getAVCodecContext().sample_fmt;
 
-	AvOutputStream* avOutputStream = new AvOutputStream( *this, _formatContext.getNbStreams() - 1 );
+	OutputStream* avOutputStream = new OutputStream( *this, _formatContext.getNbStreams() - 1 );
 	_outputStreams.push_back( avOutputStream );
 
 	return *_outputStreams.back();
@@ -69,7 +69,7 @@ IOutputStream& OutputFile::addDataStream( const DataCodec& dataDesc )
 {
 	_formatContext.addAVStream( dataDesc.getAVCodec() );
 
-	AvOutputStream* avOutputStream = new AvOutputStream( *this, _formatContext.getNbStreams() - 1 );
+	OutputStream* avOutputStream = new OutputStream( *this, _formatContext.getNbStreams() - 1 );
 	_outputStreams.push_back( avOutputStream );
 
 	return *_outputStreams.back();
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -9,7 +9,7 @@
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
 
-#include <AvTranscoder/codedStream/AvOutputStream.hpp>
+#include <AvTranscoder/codedStream/OutputStream.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
 
 #include <string>
@@ -107,7 +107,7 @@ class AvExport OutputFile
 
 private:
 	FormatContext _formatContext;
-	std::vector<AvOutputStream*> _outputStreams;  ///< Has ownership
+	std::vector<OutputStream*> _outputStreams;  ///< Has ownership
 	std::vector<size_t> _frameCount;  ///< Number of wrapped frames
 
 	std::string _filename;  ///< Output filename
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -1,7 +1,7 @@
 
 #include "StreamTranscoder.hpp"
 
-#include <AvTranscoder/codedStream/AvInputStream.hpp>
+#include <AvTranscoder/codedStream/InputStream.hpp>
 
 #include <AvTranscoder/decoder/VideoDecoder.hpp>
 #include <AvTranscoder/decoder/AudioDecoder.hpp>
@@ -93,7 +93,7 @@ StreamTranscoder::StreamTranscoder(
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
-			_inputDecoder = new VideoDecoder( *static_cast<AvInputStream*>( _inputStream ) );
+			_inputDecoder = new VideoDecoder( *static_cast<InputStream*>( _inputStream ) );
 			_inputDecoder->setup();
 
 			VideoEncoder* outputVideo = new VideoEncoder( profile.at( constants::avProfileCodec ) );
@@ -119,7 +119,7 @@ StreamTranscoder::StreamTranscoder(
 		}
 		case AVMEDIA_TYPE_AUDIO :
 		{
-			_inputDecoder = new AudioDecoder( *static_cast<AvInputStream*>( _inputStream ) );
+			_inputDecoder = new AudioDecoder( *static_cast<InputStream*>( _inputStream ) );
 			_inputDecoder->setup();
 			
 			AudioEncoder* outputAudio = new AudioEncoder( profile.at( constants::avProfileCodec )  );

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "AvInputStream.hpp"`
	`1`	`+#include "InputStream.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/file/InputFile.hpp>`
`4`	`4`
`@@ -13,7 +13,7 @@ extern "C" {`
`13`	`13`	`namespace avtranscoder`
`14`	`14`	`{`
`15`	`15`
`16`		`-AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )`
	`16`	`+InputStream::InputStream( InputFile& inputFile, const size_t streamIndex )`
`17`	`17`	`: IInputStream( )`
`18`	`18`	`, _inputFile( &inputFile )`
`19`	`19`	`, _codec( NULL )`
`@@ -54,7 +54,7 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-AvInputStream::AvInputStream( const AvInputStream& inputStream )`
	`57`	`+InputStream::InputStream( const InputStream& inputStream )`
`58`	`58`	`: IInputStream( )`
`59`	`59`	`, _inputFile( inputStream._inputFile )`
`60`	`60`	`, _codec( inputStream._codec )`
`@@ -64,12 +64,12 @@ AvInputStream::AvInputStream( const AvInputStream& inputStream )`
`64`	`64`	`{`
`65`	`65`	`}`
`66`	`66`
`67`		`-AvInputStream::~AvInputStream( )`
	`67`	`+InputStream::~InputStream( )`
`68`	`68`	`{`
`69`	`69`	`delete _codec;`
`70`	`70`	`}`
`71`	`71`
`72`		`-bool AvInputStream::readNextPacket( CodedData& data )`
	`72`	`+bool InputStream::readNextPacket( CodedData& data )`
`73`	`73`	`{`
`74`	`74`	`if( ! _isActivated )`
`75`	`75`	`throw std::runtime_error( "Can't read packet on non-activated input stream." );`
`@@ -89,7 +89,7 @@ bool AvInputStream::readNextPacket( CodedData& data )`
`89`	`89`	`return true;`
`90`	`90`	`}`
`91`	`91`
`92`		`-VideoCodec& AvInputStream::getVideoCodec()`
	`92`	`+VideoCodec& InputStream::getVideoCodec()`
`93`	`93`	`{`
`94`	`94`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`95`	`95`
`@@ -101,7 +101,7 @@ VideoCodec& AvInputStream::getVideoCodec()`
`101`	`101`	`return static_cast<VideoCodec>( _codec );;`
`102`	`102`	`}`
`103`	`103`
`104`		`-AudioCodec& AvInputStream::getAudioCodec()`
	`104`	`+AudioCodec& InputStream::getAudioCodec()`
`105`	`105`	`{`
`106`	`106`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`107`	`107`
`@@ -113,7 +113,7 @@ AudioCodec& AvInputStream::getAudioCodec()`
`113`	`113`	`return static_cast<AudioCodec>( _codec );;`
`114`	`114`	`}`
`115`	`115`
`116`		`-DataCodec& AvInputStream::getDataCodec()`
	`116`	`+DataCodec& InputStream::getDataCodec()`
`117`	`117`	`{`
`118`	`118`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`119`	`119`
`@@ -125,17 +125,17 @@ DataCodec& AvInputStream::getDataCodec()`
`125`	`125`	`return static_cast<DataCodec>( _codec );;`
`126`	`126`	`}`
`127`	`127`
`128`		`-AVMediaType AvInputStream::getStreamType() const`
	`128`	`+AVMediaType InputStream::getStreamType() const`
`129`	`129`	`{`
`130`	`130`	`return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;`
`131`	`131`	`}`
`132`	`132`
`133`		`-double AvInputStream::getDuration() const`
	`133`	`+double InputStream::getDuration() const`
`134`	`134`	`{`
`135`	`135`	`return 1.0 * _inputFile->getFormatContext().getDuration() / AV_TIME_BASE;`
`136`	`136`	`}`
`137`	`137`
`138`		`-void AvInputStream::addPacket( AVPacket& packet )`
	`138`	`+void InputStream::addPacket( AVPacket& packet )`
`139`	`139`	`{`
`140`	`140`	`// Do not cache data if the stream is declared as unused in process`
`141`	`141`	`if( ! _isActivated )`
`@@ -146,7 +146,7 @@ void AvInputStream::addPacket( AVPacket& packet )`
`146`	`146`	`_streamCache.back().copyData( packet.data, packet.size );`
`147`	`147`	`}`
`148`	`148`
`149`		`-void AvInputStream::clearBuffering()`
	`149`	`+void InputStream::clearBuffering()`
`150`	`150`	`{`
`151`	`151`	`_streamCache = std::queue<CodedData>();`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "AvOutputStream.hpp"`
	`1`	`+#include "OutputStream.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/file/OutputFile.hpp>`
`4`	`4`
`@@ -7,14 +7,14 @@`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-AvOutputStream::AvOutputStream( OutputFile& outputFile, const size_t streamIndex )`
	`10`	`+OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )`
`11`	`11`	`: IOutputStream()`
`12`	`12`	`, _outputFile( &outputFile )`
`13`	`13`	`, _streamIndex( streamIndex )`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`-IOutputStream::EWrappingStatus AvOutputStream::wrap( const CodedData& data )`
	`17`	`+IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )`
`18`	`18`	`{`
`19`	`19`	`assert( _outputFile != NULL );`
`20`	`20`	`return _outputFile->wrap( data, _streamIndex );`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ namespace avtranscoder`
`8`	`8`
`9`	`9`	`class OutputFile;`
`10`	`10`
`11`		`-class AvExport AvOutputStream : public IOutputStream`
	`11`	`+class AvExport OutputStream : public IOutputStream`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`		`- AvOutputStream( OutputFile& outputFile, const size_t streamIndex );`
	`14`	`+ OutputStream( OutputFile& outputFile, const size_t streamIndex );`
`15`	`15`
`16`	`16`	`size_t getStreamIndex() const { return _streamIndex; }`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include "AudioDecoder.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/codec/ICodec.hpp>`
`4`		`-#include <AvTranscoder/codedStream/AvInputStream.hpp>`
	`4`	`+#include <AvTranscoder/codedStream/InputStream.hpp>`
`5`	`5`	`#include <AvTranscoder/frame/AudioFrame.hpp>`
`6`	`6`
`7`	`7`	`extern "C" {`
`@@ -18,7 +18,7 @@ extern "C" {`
`18`	`18`	`namespace avtranscoder`
`19`	`19`	`{`
`20`	`20`
`21`		`-AudioDecoder::AudioDecoder( AvInputStream& inputStream )`
	`21`	`+AudioDecoder::AudioDecoder( InputStream& inputStream )`
`22`	`22`	`: _inputStream ( &inputStream )`
`23`	`23`	`, _frame ( NULL )`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include "VideoDecoder.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/codec/ICodec.hpp>`
`4`		`-#include <AvTranscoder/codedStream/AvInputStream.hpp>`
	`4`	`+#include <AvTranscoder/codedStream/InputStream.hpp>`
`5`	`5`	`#include <AvTranscoder/frame/VideoFrame.hpp>`
`6`	`6`
`7`	`7`	`extern "C" {`
`@@ -17,7 +17,7 @@ extern "C" {`
`17`	`17`	`namespace avtranscoder`
`18`	`18`	`{`
`19`	`19`
`20`		`-VideoDecoder::VideoDecoder( AvInputStream& inputStream )`
	`20`	`+VideoDecoder::VideoDecoder( InputStream& inputStream )`
`21`	`21`	`: _inputStream ( &inputStream )`
`22`	`22`	`, _frame ( NULL )`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ InputFile::InputFile( const std::string& filename )`
`31`	`31`	`// Create streams`
`32`	`32`	`for( size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex )`
`33`	`33`	`{`
`34`		`- _inputStreams.push_back( new AvInputStream( *this, streamIndex ) );`
	`34`	`+ _inputStreams.push_back( new InputStream( *this, streamIndex ) );`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`InputFile::~InputFile()`
`39`	`39`	`{`
`40`		`- for( std::vector< AvInputStream* >::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )`
	`40`	`+ for( std::vector< InputStream* >::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )`
`41`	`41`	`{`
`42`	`42`	`delete (*it);`
`43`	`43`	`}`
`@@ -149,7 +149,7 @@ void InputFile::seekAtFrame( const size_t frame )`
`149`	`149`	`std::cerr << "Error during seek at " << frame << " (" << pos << ") in file" << std::endl;`
`150`	`150`	`}`
`151`	`151`
`152`		`- for( std::vector<AvInputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )`
	`152`	`+ for( std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )`
`153`	`153`	`{`
`154`	`154`	`(*it)->clearBuffering();`
`155`	`155`	`}`
`@@ -160,7 +160,7 @@ void InputFile::activateStream( const size_t streamIndex, bool activate )`
`160`	`160`	`getStream( streamIndex ).activate( activate );`
`161`	`161`	`}`
`162`	`162`
`163`		`-AvInputStream& InputFile::getStream( size_t index )`
	`163`	`+InputStream& InputFile::getStream( size_t index )`
`164`	`164`	`{`
`165`	`165`	`try`
`166`	`166`	`{`