clean polimophic deletion: adding desctructors on virtual classes

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit cb47640bc5b4 · 2014-06-24T12:07:05.000-04:00
diff --git a/src/AvTranscoder/DatasStructures/Frame.hpp b/src/AvTranscoder/DatasStructures/Frame.hpp
@@ -14,8 +14,9 @@ typedef std::vector< unsigned char> DataBuffer;
 class AvExport Frame
 {
 public:
-
-	Frame() {};
+	Frame(){};
+	
+	virtual ~Frame(){};
 
 	virtual DataBuffer& getBuffer() { return m_dataBuffer; }
 	virtual unsigned char* getPtr() { return &m_dataBuffer[0]; }
diff --git a/src/AvTranscoder/DatasStructures/Image.hpp b/src/AvTranscoder/DatasStructures/Image.hpp
@@ -88,6 +88,9 @@ class AvExport Image : public Frame
 		m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );
 	}
 
+	virtual ~Image()
+	{};
+
 	const ImageDesc&     desc() const    { return m_imageDesc; }
 
 private:
diff --git a/src/AvTranscoder/InputStreamReader.hpp b/src/AvTranscoder/InputStreamReader.hpp
@@ -12,6 +12,8 @@ class AvExport InputStreamReader
 {
 public:
 	InputStreamReader( AvInputStream& inputStream ) {};
+
+	virtual ~InputStreamReader() {};
 	
 	virtual void setup() = 0;
 
diff --git a/src/AvTranscoder/OutputStreamWriter.hpp b/src/AvTranscoder/OutputStreamWriter.hpp
@@ -23,6 +23,9 @@ class AvExport OutputStreamWriter
 	OutputStreamWriter()
 	{}
 
+	virtual ~OutputStreamWriter()
+	{}
+
 	/**
 	 * @brief Setup the encoder
 	 * @return status of setup
diff --git a/src/AvTranscoder/StreamTranscoder.cpp b/src/AvTranscoder/StreamTranscoder.cpp
@@ -8,11 +8,7 @@ StreamTranscoder::StreamTranscoder( AvInputStream& stream, OutputFile& outputFil
 	: _stream( &stream )
 	, _frameBuffer( NULL )
 	, _inputStreamReader( NULL )
-	, _inputStreamVideo( NULL )
-	, _inputStreamAudio( NULL )
 	, _outputStreamWriter( NULL )
-	, _outputStreamVideo( NULL )
-	, _outputStreamAudio( NULL )
 	, _outputFile( &outputFile )
 	, _streamIndex( streamId )
 	, _transcodeStream( false )
@@ -23,16 +19,10 @@ StreamTranscoder::~StreamTranscoder()
 {
 	if( _frameBuffer )
 		delete _frameBuffer;
-
-	if( _inputStreamVideo )
-		delete _inputStreamVideo;
-	if( _inputStreamAudio )
-		delete _inputStreamAudio;
-
-	if( _outputStreamVideo )
-		delete _outputStreamVideo;
-	if( _outputStreamAudio )
-		delete _outputStreamAudio;
+	if( _inputStreamReader )
+		delete _inputStreamReader;
+	if( _outputStreamWriter )
+		delete _outputStreamWriter;
 }
 
 void StreamTranscoder::init( const std::string& profile )
@@ -43,8 +33,7 @@ void StreamTranscoder::init( const std::string& profile )
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
-			_inputStreamVideo = new InputStreamVideo( *_stream );
-			_inputStreamReader = _inputStreamVideo;
+			_inputStreamReader = new InputStreamVideo( *_stream );
 			_inputStreamReader->setup();
 
 			// re-wrap only, get output descriptor from input
@@ -54,20 +43,19 @@ void StreamTranscoder::init( const std::string& profile )
 				break;
 			}
 
-			_outputStreamVideo = new OutputStreamVideo();
-			_outputStreamWriter = _outputStreamVideo;
+			OutputStreamVideo* outputStreamVideo = new OutputStreamVideo();
+			_outputStreamWriter = outputStreamVideo;
 
 			_outputStreamWriter->setProfile( profile );
-			_outputFile->addVideoStream( _outputStreamVideo->getVideoDesc() );
-			_videoFrameBuffer = new Image( _outputStreamVideo->getVideoDesc().getImageDesc() );
+			_outputFile->addVideoStream( outputStreamVideo->getVideoDesc() );
+			_videoFrameBuffer = new Image( outputStreamVideo->getVideoDesc().getImageDesc() );
 			_frameBuffer = _videoFrameBuffer;
 			
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO :
 		{
-			_inputStreamAudio = new InputStreamAudio( *_stream );
-			_inputStreamReader = _inputStreamAudio;
+			_inputStreamReader = new InputStreamAudio( *_stream );
 			_inputStreamReader->setup();
 
 			// re-wrap only, get output descriptor from input
@@ -77,12 +65,12 @@ void StreamTranscoder::init( const std::string& profile )
 				break;
 			}
 			
-			_outputStreamAudio = new OutputStreamAudio();
-			_outputStreamWriter = _outputStreamAudio;
+			OutputStreamAudio* outputStreamAudio = new OutputStreamAudio();
+			_outputStreamWriter = outputStreamAudio;
 
 			_outputStreamWriter->setProfile( profile );
-			_outputFile->addAudioStream( _outputStreamAudio->getAudioDesc() );
-			_audioFrameBuffer = new AudioFrame( _outputStreamAudio->getAudioDesc().getFrameDesc() );
+			_outputFile->addAudioStream( outputStreamAudio->getAudioDesc() );
+			_audioFrameBuffer = new AudioFrame( outputStreamAudio->getAudioDesc().getFrameDesc() );
 			_frameBuffer = _audioFrameBuffer;
 			
 			break;
diff --git a/src/AvTranscoder/StreamTranscoder.hpp b/src/AvTranscoder/StreamTranscoder.hpp
@@ -36,13 +36,7 @@ class StreamTranscoder
 	AudioFrame* _audioFrameBuffer;
 
 	InputStreamReader*  _inputStreamReader;
-	InputStreamVideo*   _inputStreamVideo;
-	InputStreamAudio*   _inputStreamAudio;
-
 	OutputStreamWriter* _outputStreamWriter;
-	OutputStreamVideo*  _outputStreamVideo;
-	OutputStreamAudio*  _outputStreamAudio;
-
 	OutputFile* _outputFile;
 
 	size_t _streamIndex;

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ class AvExport Image : public Frame`
`88`	`88`	`m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ virtual ~Image()`
	`92`	`+ {};`
	`93`	`+`
`91`	`94`	`const ImageDesc& desc() const { return m_imageDesc; }`
`92`	`95`
`93`	`96`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ class AvExport InputStreamReader`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`	`InputStreamReader( AvInputStream& inputStream ) {};`
	`15`	`+`
	`16`	`+ virtual ~InputStreamReader() {};`
`15`	`17`
`16`	`18`	`virtual void setup() = 0;`
`17`	`19`