Fix tst_qvideoframe test failures

Change-Id: I25bceb948518ba49053ae87484bdd8375b616b20
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/multimedia/video/qvideotexturehelper_p.h b/src/multimedia/video/qvideotexturehelper_p.h
index e0b72243a..a984101e5 100644
--- a/src/multimedia/video/qvideotexturehelper_p.h
+++ b/src/multimedia/video/qvideotexturehelper_p.h
@@ -57,11 +57,14 @@ struct TextureDescription
         int x;
         int y;
     };
-    using BytesForSize = int(*)(QSize s);
+    using BytesRequired = int(*)(int stride, int height);
+
+    inline int strideForWidth(int width) const { return (width*strideFactor + 15) & ~15; }
+    inline int bytesForSize(QSize s) const { return bytesRequired(strideForWidth(s.width()), s.height()); }
 
     int nplanes;
-    int stride;
-    BytesForSize bytesForSize;
+    int strideFactor;
+    BytesRequired bytesRequired;
     QRhiTexture::Format textureFormat[maxPlanes];
     SizeScale sizeScale[maxPlanes];
 };