slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make this unit test a bit more robust for qreal changes.

Browse Source 
It's not just ARM that has qreal == float (and sometimes not even then)

Change-Id: Ic2fa890afd9f926c455442d04dc84e57dffe7787
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-03-26 13:35:44 +10:00
committed by Qt by Nokia
parent 6522fecfb1
commit aa291c55b4
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
View File

@@ -996,11 +996,7 @@ void tst_QVideoSurfaceFormat::debugOperator()
" frameWidth = QVariant(int, %6) \n" " frameWidth = QVariant(int, %6) \n"
" viewport = QVariant(QRect, QRect(0,1 800x600) ) \n" " viewport = QVariant(QRect, QRect(0,1 800x600) ) \n"
" scanLineDirection = QVariant(QVideoSurfaceFormat::Direction, ) \n" " scanLineDirection = QVariant(QVideoSurfaceFormat::Direction, ) \n"
#if defined(Q_PROCESSOR_ARM) // from qglobal.h " frameRate = QVariant(%7, %8) \n"
" frameRate = QVariant(float, %7) \n"
#else
" frameRate = QVariant(double, %7) \n"
#endif
" pixelAspectRatio = QVariant(QSize, QSize(320, 200) ) \n" " pixelAspectRatio = QVariant(QSize, QSize(320, 200) ) \n"
" sizeHint = QVariant(QSize, QSize(1280, 600) ) \n" " sizeHint = QVariant(QSize, QSize(1280, 600) ) \n"
" yCbCrColorSpace = QVariant(QVideoSurfaceFormat::YCbCrColorSpace, ) ") " yCbCrColorSpace = QVariant(QVideoSurfaceFormat::YCbCrColorSpace, ) ")
@@ -1010,6 +1006,7 @@ void tst_QVideoSurfaceFormat::debugOperator()
.arg(frameSize.width()) .arg(frameSize.width())
.arg(frameSize.height()) .arg(frameSize.height())
.arg(frameSize.width()) .arg(frameSize.width())
.arg(sizeof(qreal) == sizeof(double) ? "double" : "float")
.arg(frameRate); .arg(frameRate);
QVideoSurfaceFormat vsf(frameSize, format, QAbstractVideoBuffer::GLTextureHandle); QVideoSurfaceFormat vsf(frameSize, format, QAbstractVideoBuffer::GLTextureHandle);