VideoFrame: fix memory leak when allocating a new picture

Clement Champetier · Clement Champetier · commit 8d0ac3f3410e · 2016-10-26T11:19:53.000+02:00
See ffmpeg doc: https://www.ffmpeg.org/doxygen/3.0/group__lavc__picture.html#ga40412936f5777964c0c80b1742ec58ef
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -56,6 +56,11 @@ VideoFrame::VideoFrame(const Frame& otherFrame)
 {
 }
 
+VideoFrame::~VideoFrame()
+{
+    freeAVPicture();
+}
+
 size_t VideoFrame::getSize() const
 {
     if(getPixelFormat() == AV_PIX_FMT_NONE)
@@ -87,6 +92,11 @@ void VideoFrame::allocateAVPicture(const VideoFrameDesc& desc)
     _frame->format = desc._pixelFormat;
 }
 
+void VideoFrame::freeAVPicture()
+{
+    avpicture_free(reinterpret_cast<AVPicture*>(_frame));
+}
+
 void VideoFrame::assign(const unsigned char value)
 {
     // Create the image buffer
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.hpp b/src/AvTranscoder/data/decoded/VideoFrame.hpp
@@ -45,6 +45,7 @@ class AvExport VideoFrame : public Frame
 public:
     VideoFrame(const VideoFrameDesc& ref);
     VideoFrame(const Frame& otherFrame);
+    ~VideoFrame();
 
     size_t getWidth() const { return _frame->width; }
     size_t getHeight() const { return _frame->height; }
@@ -68,9 +69,16 @@ class AvExport VideoFrame : public Frame
 private:
     /**
      * @brief Allocate the image buffer of the frame.
+     * @warning The allocated data should be freed by the caller.
+     * @see freeAVPicture
      */
     void allocateAVPicture(const VideoFrameDesc& desc);
 
+    /**
+     * @brief Free the image buffer of the frame.
+     */
+    void freeAVPicture();
+
     /**
      * @note To allocate new image buffer if needed.
      * @see allocateAVPicture

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ VideoFrame::VideoFrame(const Frame& otherFrame)`
`56`	`56`	`{`
`57`	`57`	`}`
`58`	`58`
	`59`	`+VideoFrame::~VideoFrame()`
	`60`	`+{`
	`61`	`+ freeAVPicture();`
	`62`	`+}`
	`63`	`+`
`59`	`64`	`size_t VideoFrame::getSize() const`
`60`	`65`	`{`
`61`	`66`	`if(getPixelFormat() == AV_PIX_FMT_NONE)`
`@@ -87,6 +92,11 @@ void VideoFrame::allocateAVPicture(const VideoFrameDesc& desc)`
`87`	`92`	`_frame->format = desc._pixelFormat;`
`88`	`93`	`}`
`89`	`94`
	`95`	`+void VideoFrame::freeAVPicture()`
	`96`	`+{`
	`97`	`+ avpicture_free(reinterpret_cast<AVPicture*>(_frame));`
	`98`	`+}`
	`99`	`+`
`90`	`100`	`void VideoFrame::assign(const unsigned char value)`
`91`	`101`	`{`
`92`	`102`	`// Create the image buffer`