Merge pull request #21 from cchampet/fix_dummy

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 2f9f4a285be4 · 2014-07-15T18:14:36.000+02:00
Fix dummy stream
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.cpp b/src/AvTranscoder/DatasStructures/AudioDesc.cpp
@@ -37,13 +37,6 @@ AudioDesc::AudioDesc( const AVCodecID codecId )
 	setAudioCodec( codecId );
 }
 
-AudioDesc::AudioDesc( const AudioDesc& audioDesc )
-	: m_codec( NULL )
-	, m_codecContext( NULL ) 
-{
-	setAudioCodec( audioDesc.getAudioCodecId() );
-}
-
 void AudioDesc::setAudioCodec( const std::string& codecName )
 {
 	avcodec_register_all();  // Warning: should be called only once
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.hpp b/src/AvTranscoder/DatasStructures/AudioDesc.hpp
@@ -26,8 +26,6 @@ class AvExport AudioDesc
 	AudioDesc( const std::string& codecName = "" );
 	AudioDesc( const AVCodecID codecId );
 	
-	AudioDesc( const AudioDesc& audioDesc );
-
 	void setAudioCodec( const std::string& codecName );
 	void setAudioCodec( const AVCodecID codecId );
 
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,9 @@ StreamTranscoder::~StreamTranscoder()
 {
 	if( _frameBuffer )
 		delete _frameBuffer;
-	if( _inputEssence )
+	if( _sourceBuffer )
+		delete _sourceBuffer;
+	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
`@@ -37,13 +37,6 @@ AudioDesc::AudioDesc( const AVCodecID codecId )`
`37`	`37`	`setAudioCodec( codecId );`
`38`	`38`	`}`
`39`	`39`
`40`		`-AudioDesc::AudioDesc( const AudioDesc& audioDesc )`
`41`		`- : m_codec( NULL )`
`42`		`- , m_codecContext( NULL )`
`43`		`-{`
`44`		`- setAudioCodec( audioDesc.getAudioCodecId() );`
`45`		`-}`
`46`		`-`
`47`	`40`	`void AudioDesc::setAudioCodec( const std::string& codecName )`
`48`	`41`	`{`
`49`	`42`	`avcodec_register_all(); // Warning: should be called only once`
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`	`}`