StreamTranscoder: fix desctructor when dummy stream

Clement Champetier · Clement Champetier · commit d106e679b347 · 2014-07-15T14:18:30.000+02:00
* Need to know if it is a dummy stream or something else when destruct
StreamTranscoder:
     * _inputEssence references to a Dummy created in Transcoder if
dummy: not delete it in StreamTranscoder!
     * new _inputEssence in StreamTranscoder if not dummy: delete it in
StreamTranscoder!
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -26,6 +26,7 @@ StreamTranscoder::StreamTranscoder(
 	, _outputEssence( NULL )
 	, _transform( NULL )
 	, _transcodeStream( false )
+	, _dummyStream( false )
 {
 	// create a re-wrapping case
 	switch( _inputStream->getStreamType() )
@@ -58,6 +59,7 @@ StreamTranscoder::StreamTranscoder(
 	, _outputEssence( NULL )
 	, _transform( NULL )
 	, _transcodeStream( true )
+	, _dummyStream( false )
 {
 	// create a transcode case
 	switch( _inputStream->getStreamType() )
@@ -121,7 +123,9 @@ StreamTranscoder::StreamTranscoder(
 	, _outputEssence( NULL )
 	, _transform( NULL )
 	, _transcodeStream( true )
+	, _dummyStream( true )
 {
+	// create a dummy case
 	if( ! profile.count( Profile::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
@@ -168,7 +172,7 @@ StreamTranscoder::~StreamTranscoder()
 {
 	if( _frameBuffer )
 		delete _frameBuffer;
-	if( _inputEssence )
+	if( _inputEssence && ! _dummyStream )
 		delete _inputEssence;
 	if( _outputEssence )
 		delete _outputEssence;
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -63,8 +63,7 @@ class StreamTranscoder
 	EssenceTransform* _transform;
 
 	bool _transcodeStream;
-
-
+	bool _dummyStream;
 };
 	
 }

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ class StreamTranscoder`
`63`	`63`	`EssenceTransform* _transform;`
`64`	`64`
`65`	`65`	`bool _transcodeStream;`
`66`		`-`
`67`		`-`
	`66`	`+ bool _dummyStream;`
`68`	`67`	`};`
`69`	`68`
`70`	`69`	`}`