1 files changed, 17 insertions, 22 deletions

diff --git a/src/plugins/multimedia/qnx/camera/qqnxcameraframebuffer.cpp b/src/plugins/multimedia/qnx/camera/qqnxcameraframebuffer.cpp
index 8ad0894f7..6595c5d42 100644
--- a/src/plugins/multimedia/qnx/camera/qqnxcameraframebuffer.cpp
+++ b/src/plugins/multimedia/qnx/camera/qqnxcameraframebuffer.cpp
@@ -105,7 +105,7 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_nv12_t &frame,
 {
 
     return {
-        .nPlanes = 2,
+        .planeCount = 2,
         .bytesPerLine = {
             toInt(frame.stride),
             toInt(frame.uv_stride)
@@ -114,7 +114,7 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_nv12_t &frame,
             baseAddress,
             baseAddress + frame.uv_offset
         },
-        .size = {
+        .dataSize = {
             toInt(frame.stride * frame.height),
             toInt(frame.uv_stride * frame.height / 2)
         }
@@ -125,14 +125,14 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_rgb8888_t &frame
         unsigned char *baseAddress)
 {
     return {
-        .nPlanes = 1,
+        .planeCount = 1,
         .bytesPerLine = {
             toInt(frame.stride)
         },
         .data = {
             baseAddress
         },
-        .size = {
+        .dataSize = {
             toInt(frame.stride * frame.height),
         }
     };
@@ -142,14 +142,14 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_gray8_t &frame,
         unsigned char *baseAddress)
 {
     return {
-        .nPlanes = 1,
+        .planeCount = 1,
         .bytesPerLine = {
             toInt(frame.stride)
         },
         .data = {
             baseAddress
         },
-        .size = {
+        .dataSize = {
             toInt(frame.stride * frame.height)
         }
     };
@@ -159,14 +159,14 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_cbycry_t &frame,
         unsigned char *baseAddress)
 {
     return {
-        .nPlanes = 1,
+        .planeCount = 1,
         .bytesPerLine = {
             toInt(frame.stride)
         },
         .data = {
             baseAddress
         },
-        .size = {
+        .dataSize = {
             toInt(frame.bufsize),
         }
     };
@@ -176,7 +176,7 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_ycbcr420p_t &fra
         unsigned char *baseAddress)
 {
     return {
-        .nPlanes = 3,
+        .planeCount = 3,
         .bytesPerLine = {
             toInt(frame.y_stride),
             frame.cb_stride,
@@ -187,7 +187,7 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_ycbcr420p_t &fra
             baseAddress + frame.cb_offset,
             baseAddress + frame.cr_offset,
         },
-        .size = {
+        .dataSize = {
             toInt(frame.y_stride * frame.height),
             toInt(frame.cb_stride * frame.height / 2),
             toInt(frame.cr_stride * frame.height / 2)
@@ -199,14 +199,14 @@ static QAbstractVideoBuffer::MapData mapData(const camera_frame_ycbycr_t &frame,
         unsigned char *baseAddress)
 {
     return {
-        .nPlanes = 1,
+        .planeCount = 1,
         .bytesPerLine = {
             toInt(frame.stride)
         },
         .data = {
             baseAddress
         },
-        .size = {
+        .dataSize = {
             toInt(frame.stride * frame.height)
         }
     };
@@ -260,10 +260,10 @@ static constexpr QSize frameSize(const camera_buffer_t *buffer)
 QT_BEGIN_NAMESPACE
 
 QQnxCameraFrameBuffer::QQnxCameraFrameBuffer(const camera_buffer_t *buffer, QRhi *rhi)
-    : QAbstractVideoBuffer(rhi ? QVideoFrame::RhiTextureHandle : QVideoFrame::NoHandle, rhi)
-    , m_rhi(rhi)
-    , m_pixelFormat(::frameTypeToPixelFormat(buffer->frametype))
-    , m_dataSize(::bufferDataSize(buffer))
+    : QHwVideoBuffer(rhi ? QVideoFrame::RhiTextureHandle : QVideoFrame::NoHandle, rhi),
+      m_rhi(rhi),
+      m_pixelFormat(::frameTypeToPixelFormat(buffer->frametype)),
+      m_dataSize(::bufferDataSize(buffer))
 {
     if (m_dataSize <= 0)
         return;
@@ -277,12 +277,7 @@ QQnxCameraFrameBuffer::QQnxCameraFrameBuffer(const camera_buffer_t *buffer, QRhi
     m_frameSize = ::frameSize(buffer);
 }
 
-QVideoFrame::MapMode QQnxCameraFrameBuffer::mapMode() const
-{
-    return QVideoFrame::ReadOnly;
-}
-
-QAbstractVideoBuffer::MapData QQnxCameraFrameBuffer::map(QVideoFrame::MapMode)
+QAbstractVideoBuffer::MapData QQnxCameraFrameBuffer::map(QtVideo::MapMode)
 {
     return m_mapData;
 }