Transcoder: fix destructor

Clement Champetier · Clement Champetier · commit 30a4ee1cf6fb · 2014-07-03T17:40:51.000+02:00
* Fix seg fault in destructor: delete twice the array of DummyAudio and
DummyVideo.
* Only store them in the StreamTranscoders!
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -20,14 +20,6 @@ Transcoder::~Transcoder()
 	{
 		delete (*it);
 	}
-	for( std::vector< DummyAudio* >::iterator it = _dummyAudio.begin(); it != _dummyAudio.end(); ++it )
-	{
-		delete (*it);
-	}
-	for( std::vector< DummyVideo* >::iterator it = _dummyVideo.begin(); it != _dummyVideo.end(); ++it )
-	{
-		delete (*it);
-	}
 	for( std::vector< StreamTranscoder* >::iterator it = _streamTranscoders.begin(); it != _streamTranscoders.end(); ++it )
 	{
 		delete (*it);
@@ -175,15 +167,15 @@ void Transcoder::addDummyStream( Profile::ProfileDesc& profile )
 
 	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
 	{
-		_dummyAudio.push_back( new DummyAudio() );
-		StreamTranscoder* streamTranscoder = new StreamTranscoder( *_dummyAudio.back(), _outputFile, profile );
+		DummyAudio* dummyAudio = new DummyAudio();
+		StreamTranscoder* streamTranscoder = new StreamTranscoder( *dummyAudio, _outputFile, profile );
 		_streamTranscoders.push_back( streamTranscoder );
 	}
 
 	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
 	{
-		_dummyVideo.push_back( new DummyVideo() );
-		StreamTranscoder* streamTranscoder = new StreamTranscoder( *_dummyVideo.back(), _outputFile, profile );
+		DummyVideo* dummyVideo = new DummyVideo();
+		StreamTranscoder* streamTranscoder = new StreamTranscoder( *dummyVideo, _outputFile, profile );
 		_streamTranscoders.push_back( streamTranscoder );
 	}
 }
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -60,8 +60,6 @@ class Transcoder
 	std::vector< InputStream* >      _inputStreams;
 	std::vector< StreamTranscoder* > _streamTranscoders;
 	
-	std::vector< DummyAudio* > _dummyAudio;
-	std::vector< DummyVideo* > _dummyVideo;
 	Profile _profile;
 
 	bool _verbose;

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,6 @@ Transcoder::~Transcoder()`
`20`	`20`	`{`
`21`	`21`	`delete (*it);`
`22`	`22`	`}`
`23`		`- for( std::vector< DummyAudio* >::iterator it = _dummyAudio.begin(); it != _dummyAudio.end(); ++it )`
`24`		`- {`
`25`		`- delete (*it);`
`26`		`- }`
`27`		`- for( std::vector< DummyVideo* >::iterator it = _dummyVideo.begin(); it != _dummyVideo.end(); ++it )`
`28`		`- {`
`29`		`- delete (*it);`
`30`		`- }`
`31`	`23`	`for( std::vector< StreamTranscoder* >::iterator it = _streamTranscoders.begin(); it != _streamTranscoders.end(); ++it )`
`32`	`24`	`{`
`33`	`25`	`delete (*it);`
`@@ -175,15 +167,15 @@ void Transcoder::addDummyStream( Profile::ProfileDesc& profile )`
`175`	`167`
`176`	`168`	`if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )`
`177`	`169`	`{`
`178`		`- _dummyAudio.push_back( new DummyAudio() );`
`179`		`- StreamTranscoder* streamTranscoder = new StreamTranscoder( *_dummyAudio.back(), _outputFile, profile );`
	`170`	`+ DummyAudio* dummyAudio = new DummyAudio();`
	`171`	`+ StreamTranscoder* streamTranscoder = new StreamTranscoder( *dummyAudio, _outputFile, profile );`
`180`	`172`	`_streamTranscoders.push_back( streamTranscoder );`
`181`	`173`	`}`
`182`	`174`
`183`	`175`	`if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )`
`184`	`176`	`{`
`185`		`- _dummyVideo.push_back( new DummyVideo() );`
`186`		`- StreamTranscoder* streamTranscoder = new StreamTranscoder( *_dummyVideo.back(), _outputFile, profile );`
	`177`	`+ DummyVideo* dummyVideo = new DummyVideo();`
	`178`	`+ StreamTranscoder* streamTranscoder = new StreamTranscoder( *dummyVideo, _outputFile, profile );`
`187`	`179`	`_streamTranscoders.push_back( streamTranscoder );`
`188`	`180`	`}`
`189`	`181`	`}`