Added QAbstractVideoBuffer::release virtual method

It's useful when the buffer pool stores QAbstractVideoBuffer
instances instead of underlying system buffers and
allows to avoid reallocation of QAbstractVideoBuffer instances.

The default implementation deletes the buffer,
so this change is source compatible.

Change-Id: I7dadd7dac529748b5eb33e5aa7c2d0578b8b1634
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index 0d0ff597e2f33d8e7474dcef9c423fa5cc6baa0f..127cd5ea04c10e6260b64395260f3b4c05ffd82c 100644 (file)
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -148,6 +148,19 @@ QAbstractVideoBuffer::~QAbstractVideoBuffer()
     delete d_ptr;
 }
 
+/*!
+    Releases the video buffer.
+
+    QVideoFrame calls QAbstractVideoBuffer::release when the buffer is not used
+    any more and can be destroyed or returned to the buffer pool.
+
+    The default implementation deletes the buffer instance.
+*/
+void QAbstractVideoBuffer::release()
+{
+    delete this;
+}
+
 /*!
     Returns the type of a video buffer's handle.
 

diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index 0e92d32858634d1d7efb47fa9bc3fe1ed248d6a1..6bd7f8a58327f1e78e520778be3be191991f0703 100644 (file)
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -82,6 +82,7 @@ public:
 
     QAbstractVideoBuffer(HandleType type);
     virtual ~QAbstractVideoBuffer();
+    virtual void release();
 
     HandleType handleType() const;
 

diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index c17a88835665b8ecb6bf8a9cce06be6b3d8caf30..4b13098064993ff51e6add8c3d44d0ed1af4fbc9 100644 (file)
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -102,7 +102,8 @@ public:
 
     ~QVideoFramePrivate()
     {
-        delete buffer;
+        if (buffer)
+            buffer->release();
     }
 
     QSize size;