Merge pull request #71 from cchampet/fix_memory_leaks

valnoel · valnoel · commit 1ec6ff094ca7 · 2015-02-04T14:34:22.000+01:00
Fix memory leaks
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -17,6 +17,14 @@ OutputFile::OutputFile( const std::string& filename )
 	, _verbose( false )
 {}
 
+OutputFile::~OutputFile()
+{
+	for( std::vector< OutputStream* >::iterator it = _outputStreams.begin(); it != _outputStreams.end(); ++it )
+	{
+		delete (*it);
+	}
+}
+
 bool OutputFile::setup()
 {
 	_formatContext.setOutputFormat( _filename );
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -23,6 +23,8 @@ class AvExport OutputFile : public IOutputFile
 	**/
 	OutputFile( const std::string& filename = "" );
 
+	~OutputFile();
+
 	/**
 	 * @brief Initialize the OutputFile, create format context to wrap essences into output file.
 	 * @note call this before adding streams using addVideoStream() or addAudioStream()
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -37,6 +37,11 @@ AudioTransform::AudioTransform()
 {
 }
 
+AudioTransform::~AudioTransform()
+{
+	FreeResampleContext( &_audioConvertContext );
+}
+
 bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 {
 	const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -21,6 +21,7 @@ class AvExport AudioTransform : public ITransform
 {
 public:
 	AudioTransform();
+	~AudioTransform();
 
 	void convert( const Frame& srcFrame, Frame& dstFrame );
 
diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -31,16 +31,20 @@ VideoTransform::VideoTransform()
 {
 }
 
+VideoTransform::~VideoTransform()
+{
+	sws_freeContext( _imageConvertContext );
+}
+
 bool VideoTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 {
 	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
 	const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );
 
-
 	const AVPixelFormat srcPixelFormat = src.desc().getPixelFormat();
 	const AVPixelFormat dstPixelFormat = dst.desc().getPixelFormat();
 
-	_imageConvertContext = sws_getContext(
+	_imageConvertContext = sws_getCachedContext( _imageConvertContext,
 		src.desc().getWidth(), src.desc().getHeight(), srcPixelFormat,
 		dst.desc().getWidth(), dst.desc().getHeight(), dstPixelFormat,
 		SWS_POINT, NULL, NULL, NULL);
diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp
@@ -16,6 +16,7 @@ class AvExport VideoTransform : public ITransform
 {
 public:
 	VideoTransform();
+	~VideoTransform();
 
 	void convert( const Frame& srcFrame, Frame& dstFrame );
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@ AudioTransform::AudioTransform()`
`37`	`37`	`{`
`38`	`38`	`}`
`39`	`39`
	`40`	`+AudioTransform::~AudioTransform()`
	`41`	`+{`
	`42`	`+ FreeResampleContext( &_audioConvertContext );`
	`43`	`+}`
	`44`	`+`
`40`	`45`	`bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )`
`41`	`46`	`{`
`42`	`47`	`const AudioFrame& src = static_cast<const AudioFrame&>( srcFrame );`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class AvExport AudioTransform : public ITransform`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`	`23`	`AudioTransform();`
	`24`	`+ ~AudioTransform();`
`24`	`25`
`25`	`26`	`void convert( const Frame& srcFrame, Frame& dstFrame );`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class AvExport VideoTransform : public ITransform`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`	`18`	`VideoTransform();`
	`19`	`+ ~VideoTransform();`
`19`	`20`
`20`	`21`	`void convert( const Frame& srcFrame, Frame& dstFrame );`
`21`	`22`