AudioFrame: fix memory leak when allocating a new audio buffer

Clement Champetier · Clement Champetier · commit 88af737ae79d · 2016-10-26T11:19:12.000+02:00
See ffmpeg doc: https://www.ffmpeg.org/doxygen/2.7/group__lavu__sampmanip.html#ga4db4c77f928d32c7d8854732f50b8c04
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -57,6 +57,11 @@ std::string AudioFrame::getChannelLayoutDesc() const
     return std::string(buf);
 }
 
+AudioFrame::~AudioFrame()
+{
+    freeAVSample();
+}
+
 size_t AudioFrame::getSize() const
 {
     if(getSampleFormat() == AV_SAMPLE_FMT_NONE)
@@ -104,6 +109,11 @@ void AudioFrame::allocateAVSample(const AudioFrameDesc& desc)
     }
 }
 
+void AudioFrame::freeAVSample()
+{
+    av_freep(&_frame->data[0]);
+}
+
 void AudioFrame::assign(const unsigned char value)
 {
     // Create the audio buffer
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -41,6 +41,7 @@ class AvExport AudioFrame : public Frame
      */
     AudioFrame(const AudioFrameDesc& ref);
     AudioFrame(const Frame& otherFrame);
+    ~AudioFrame();
 
     size_t getSampleRate() const { return av_frame_get_sample_rate(_frame); }
     size_t getNbChannels() const { return av_frame_get_channels(_frame); }
@@ -69,9 +70,16 @@ class AvExport AudioFrame : public Frame
 private:
     /**
      * @brief Allocate the audio buffer of the frame.
+     * @warning The allocated data should be freed by the caller.
+     * @see freeAVSample
      */
     void allocateAVSample(const AudioFrameDesc& ref);
 
+    /**
+     * @brief Free the audio buffer of the frame.
+     */
+    void freeAVSample();
+
     /**
      * @note To allocate new audio buffer if needed.
      * @see allocateAVSample

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ std::string AudioFrame::getChannelLayoutDesc() const`
`57`	`57`	`return std::string(buf);`
`58`	`58`	`}`
`59`	`59`
	`60`	`+AudioFrame::~AudioFrame()`
	`61`	`+{`
	`62`	`+ freeAVSample();`
	`63`	`+}`
	`64`	`+`
`60`	`65`	`size_t AudioFrame::getSize() const`
`61`	`66`	`{`
`62`	`67`	`if(getSampleFormat() == AV_SAMPLE_FMT_NONE)`
`@@ -104,6 +109,11 @@ void AudioFrame::allocateAVSample(const AudioFrameDesc& desc)`
`104`	`109`	`}`
`105`	`110`	`}`
`106`	`111`
	`112`	`+void AudioFrame::freeAVSample()`
	`113`	`+{`
	`114`	`+ av_freep(&_frame->data[0]);`
	`115`	`+}`
	`116`	`+`
`107`	`117`	`void AudioFrame::assign(const unsigned char value)`
`108`	`118`	`{`
`109`	`119`	`// Create the audio buffer`