Rename InputVideo / InputAudio classes to AvInputVideo / AvInputAudio

Clement Champetier · Clement Champetier · commit c2525fb80125 · 2014-09-24T14:59:15.000+02:00
diff --git a/app/cpp/avTranscoder/avTranscoder.cpp b/app/cpp/avTranscoder/avTranscoder.cpp
@@ -25,7 +25,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 	input.readStream( input.getProperties().videoStreams.at( 0 ).streamId );
 
 	// init video decoders
-	InputVideo inputVideo( input.getStream( 0 ) );
+	AvInputVideo inputVideo( input.getStream( 0 ) );
 	VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoDesc().getVideoFrameDesc();
 	VideoFrame sourceImage( VideoFrameDesc );
 
diff --git a/app/cpp/avplay/AvReader.hpp b/app/cpp/avplay/AvReader.hpp
@@ -25,7 +25,7 @@ class AvReader : public Reader
 
 		_inputFile.readStream( _videoStream );
 
-		_inputVideo = new avtranscoder::InputVideo( _inputFile.getStream( _videoStream ) );
+		_inputVideo = new avtranscoder::AvInputVideo( _inputFile.getStream( _videoStream ) );
 		
 		_inputVideo->setup();
 
@@ -104,7 +104,7 @@ class AvReader : public Reader
 private:
 	avtranscoder::InputFile   _inputFile;
 	
-	avtranscoder::InputVideo* _inputVideo;
+	avtranscoder::AvInputVideo* _inputVideo;
 
 	avtranscoder::VideoFrame* _sourceImage;
 	avtranscoder::VideoFrame* _imageToDisplay;
diff --git a/src/AvTranscoder/essenceStream/InputAudio.cpp b/src/AvTranscoder/essenceStream/InputAudio.cpp
@@ -20,7 +20,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-InputAudio::InputAudio( AvInputStream& inputStream ) 
+AvInputAudio::AvInputAudio( AvInputStream& inputStream ) 
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
 	, _codec         ( NULL )
@@ -30,7 +30,7 @@ InputAudio::InputAudio( AvInputStream& inputStream )
 {
 }
 
-InputAudio::~InputAudio()
+AvInputAudio::~AvInputAudio()
 {
 	if( _codecContext != NULL )
 	{
@@ -54,7 +54,7 @@ InputAudio::~InputAudio()
 }
 
 
-void InputAudio::setup()
+void AvInputAudio::setup()
 {
 	avcodec_register_all();
 
@@ -101,7 +101,7 @@ void InputAudio::setup()
 	}
 }
 
-bool InputAudio::readNextFrame( Frame& frameBuffer )
+bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 {
 	if( ! getNextFrame() )
 		return false;
@@ -130,7 +130,7 @@ bool InputAudio::readNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool InputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
 	if( ! getNextFrame() )
 		return false;
@@ -175,7 +175,7 @@ bool InputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex
 	return true;
 }
 
-bool InputAudio::getNextFrame()
+bool AvInputAudio::getNextFrame()
 {
 	int got_frame = 0;
 	while( ! got_frame )
diff --git a/src/AvTranscoder/essenceStream/InputAudio.hpp b/src/AvTranscoder/essenceStream/InputAudio.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_ESSENCE_STREAM_INPUT_AUDIO_HPP_
-#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_AUDIO_HPP_
+#ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
+#define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 
 #include "IInputEssence.hpp"
 
@@ -12,11 +12,11 @@ namespace avtranscoder
 
 class AvInputStream;
 
-class AvExport InputAudio : public IInputEssence
+class AvExport AvInputAudio : public IInputEssence
 {
 public:
-	InputAudio( AvInputStream& inputStream );
-	~InputAudio();
+	AvInputAudio( AvInputStream& inputStream );
+	~AvInputAudio();
 
 	void setup();
 
diff --git a/src/AvTranscoder/essenceStream/InputVideo.cpp b/src/AvTranscoder/essenceStream/InputVideo.cpp
@@ -19,7 +19,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-InputVideo::InputVideo( AvInputStream& inputStream )
+AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
 	, _codec         ( NULL )
@@ -29,7 +29,7 @@ InputVideo::InputVideo( AvInputStream& inputStream )
 {
 }
 
-InputVideo::~InputVideo()
+AvInputVideo::~AvInputVideo()
 {
 	if( _codecContext != NULL )
 	{
@@ -52,7 +52,7 @@ InputVideo::~InputVideo()
 	}
 }
 
-void InputVideo::setup()
+void AvInputVideo::setup()
 {
 	av_register_all();
 
@@ -95,7 +95,7 @@ void InputVideo::setup()
 	}
 }
 
-bool InputVideo::readNextFrame( Frame& frameBuffer )
+bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 {
 	int got_frame = 0;
 
@@ -137,17 +137,17 @@ bool InputVideo::readNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool InputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
 	return false;
 }
 
-void InputVideo::flushDecoder()
+void AvInputVideo::flushDecoder()
 {
 	avcodec_flush_buffers( _codecContext );
 }
 
-void InputVideo::setProfile( const Profile::ProfileDesc& desc )
+void AvInputVideo::setProfile( const Profile::ProfileDesc& desc )
 {
 	ParamSet paramSet( _codecContext );
 
diff --git a/src/AvTranscoder/essenceStream/InputVideo.hpp b/src/AvTranscoder/essenceStream/InputVideo.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
-#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
+#ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_VIDEO_HPP_
+#define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_VIDEO_HPP_
 
 #include "IInputEssence.hpp"
 
@@ -14,11 +14,11 @@ namespace avtranscoder
 
 class AvInputStream;
 
-class AvExport InputVideo : public IInputEssence
+class AvExport AvInputVideo : public IInputEssence
 {
 public:
-	InputVideo( AvInputStream& inputStream );
-	~InputVideo();
+	AvInputVideo( AvInputStream& inputStream );
+	~AvInputVideo();
 	
 	void setup();
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -93,7 +93,7 @@ StreamTranscoder::StreamTranscoder(
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
-			_inputEssence = new InputVideo( *static_cast<AvInputStream*>( _inputStream ) );
+			_inputEssence = new AvInputVideo( *static_cast<AvInputStream*>( _inputStream ) );
 			_inputEssence->setup();
 
 			OutputVideo* outputVideo = new OutputVideo();
@@ -119,7 +119,7 @@ StreamTranscoder::StreamTranscoder(
 		}
 		case AVMEDIA_TYPE_AUDIO :
 		{
-			_inputEssence = new InputAudio( *static_cast<AvInputStream*>( _inputStream ) );
+			_inputEssence = new AvInputAudio( *static_cast<AvInputStream*>( _inputStream ) );
 			_inputEssence->setup();
 			
 			OutputAudio* outputAudio = new OutputAudio();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ extern "C" {`
`20`	`20`	`namespace avtranscoder`
`21`	`21`	`{`
`22`	`22`
`23`		`-InputAudio::InputAudio( AvInputStream& inputStream )`
	`23`	`+AvInputAudio::AvInputAudio( AvInputStream& inputStream )`
`24`	`24`	`: IInputEssence()`
`25`	`25`	`, _inputStream ( &inputStream )`
`26`	`26`	`, _codec ( NULL )`
`@@ -30,7 +30,7 @@ InputAudio::InputAudio( AvInputStream& inputStream )`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`-InputAudio::~InputAudio()`
	`33`	`+AvInputAudio::~AvInputAudio()`
`34`	`34`	`{`
`35`	`35`	`if( _codecContext != NULL )`
`36`	`36`	`{`
`@@ -54,7 +54,7 @@ InputAudio::~InputAudio()`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`57`		`-void InputAudio::setup()`
	`57`	`+void AvInputAudio::setup()`
`58`	`58`	`{`
`59`	`59`	`avcodec_register_all();`
`60`	`60`
`@@ -101,7 +101,7 @@ void InputAudio::setup()`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-bool InputAudio::readNextFrame( Frame& frameBuffer )`
	`104`	`+bool AvInputAudio::readNextFrame( Frame& frameBuffer )`
`105`	`105`	`{`
`106`	`106`	`if( ! getNextFrame() )`
`107`	`107`	`return false;`
`@@ -130,7 +130,7 @@ bool InputAudio::readNextFrame( Frame& frameBuffer )`
`130`	`130`	`return true;`
`131`	`131`	`}`
`132`	`132`
`133`		`-bool InputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`133`	`+bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`134`	`134`	`{`
`135`	`135`	`if( ! getNextFrame() )`
`136`	`136`	`return false;`
`@@ -175,7 +175,7 @@ bool InputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex`
`175`	`175`	`return true;`
`176`	`176`	`}`
`177`	`177`
`178`		`-bool InputAudio::getNextFrame()`
	`178`	`+bool AvInputAudio::getNextFrame()`
`179`	`179`	`{`
`180`	`180`	`int got_frame = 0;`
`181`	`181`	`while( ! got_frame )`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extern "C" {`
`19`	`19`	`namespace avtranscoder`
`20`	`20`	`{`
`21`	`21`
`22`		`-InputVideo::InputVideo( AvInputStream& inputStream )`
	`22`	`+AvInputVideo::AvInputVideo( AvInputStream& inputStream )`
`23`	`23`	`: IInputEssence()`
`24`	`24`	`, _inputStream ( &inputStream )`
`25`	`25`	`, _codec ( NULL )`
`@@ -29,7 +29,7 @@ InputVideo::InputVideo( AvInputStream& inputStream )`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`32`		`-InputVideo::~InputVideo()`
	`32`	`+AvInputVideo::~AvInputVideo()`
`33`	`33`	`{`
`34`	`34`	`if( _codecContext != NULL )`
`35`	`35`	`{`
`@@ -52,7 +52,7 @@ InputVideo::~InputVideo()`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-void InputVideo::setup()`
	`55`	`+void AvInputVideo::setup()`
`56`	`56`	`{`
`57`	`57`	`av_register_all();`
`58`	`58`
`@@ -95,7 +95,7 @@ void InputVideo::setup()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-bool InputVideo::readNextFrame( Frame& frameBuffer )`
	`98`	`+bool AvInputVideo::readNextFrame( Frame& frameBuffer )`
`99`	`99`	`{`
`100`	`100`	`int got_frame = 0;`
`101`	`101`
`@@ -137,17 +137,17 @@ bool InputVideo::readNextFrame( Frame& frameBuffer )`
`137`	`137`	`return true;`
`138`	`138`	`}`
`139`	`139`
`140`		`-bool InputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`140`	`+bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`141`	`141`	`{`
`142`	`142`	`return false;`
`143`	`143`	`}`
`144`	`144`
`145`		`-void InputVideo::flushDecoder()`
	`145`	`+void AvInputVideo::flushDecoder()`
`146`	`146`	`{`
`147`	`147`	`avcodec_flush_buffers( _codecContext );`
`148`	`148`	`}`
`149`	`149`
`150`		`-void InputVideo::setProfile( const Profile::ProfileDesc& desc )`
	`150`	`+void AvInputVideo::setProfile( const Profile::ProfileDesc& desc )`
`151`	`151`	`{`
`152`	`152`	`ParamSet paramSet( _codecContext );`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ StreamTranscoder::StreamTranscoder(`
`93`	`93`	`{`
`94`	`94`	`case AVMEDIA_TYPE_VIDEO :`
`95`	`95`	`{`
`96`		`- _inputEssence = new InputVideo( static_cast<AvInputStream>( _inputStream ) );`
	`96`	`+ _inputEssence = new AvInputVideo( static_cast<AvInputStream>( _inputStream ) );`
`97`	`97`	`_inputEssence->setup();`
`98`	`98`
`99`	`99`	`OutputVideo* outputVideo = new OutputVideo();`
`@@ -119,7 +119,7 @@ StreamTranscoder::StreamTranscoder(`
`119`	`119`	`}`
`120`	`120`	`case AVMEDIA_TYPE_AUDIO :`
`121`	`121`	`{`
`122`		`- _inputEssence = new InputAudio( static_cast<AvInputStream>( _inputStream ) );`
	`122`	`+ _inputEssence = new AvInputAudio( static_cast<AvInputStream>( _inputStream ) );`
`123`	`123`	`_inputEssence->setup();`
`124`	`124`
`125`	`125`	`OutputAudio* outputAudio = new OutputAudio();`