Merge QAbstractPlanarVideoOutput into QAbstractVideoOutput

And while we're at it, sanitize the signature of the virtual
map() method.

Change-Id: I8feb09e1dd6abdd9f480e202568ff84e6c3c08a9
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp
index caab74e58..164aa6ebc 100644
--- a/src/multimedia/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/video/qmemoryvideobuffer.cpp
@@ -91,23 +91,21 @@ QAbstractVideoBuffer::MapMode QMemoryVideoBuffer::mapMode() const
 /*!
     \reimp
 */
-uchar *QMemoryVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
+QAbstractVideoBuffer::MapData QMemoryVideoBuffer::map(MapMode mode)
 {
     Q_D(QMemoryVideoBuffer);
 
+    MapData mapData;
     if (d->mapMode == NotMapped && d->data.size() && mode != NotMapped) {
         d->mapMode = mode;
 
-        if (numBytes)
-            *numBytes = d->data.size();
-
-        if (bytesPerLine)
-            *bytesPerLine = d->bytesPerLine;
-
-        return reinterpret_cast<uchar *>(d->data.data());
+        mapData.nBytes = d->data.size();
+        mapData.nPlanes = 1;
+        mapData.bytesPerLine[0] = d->bytesPerLine;
+        mapData.data[0] = reinterpret_cast<uchar *>(d->data.data());
     }
 
-    return nullptr;
+    return mapData;
 }
 
 /*!