summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-28 03:01:36 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-28 03:01:36 +0100
commitd0e0119251288c9c7224c5c6797a1377032aac2f (patch)
treeeb2fa404470833cf4b94847594d250dcf1ec01fc
parent46ac981d28240f93af02e4459d9ce02f294c2ab8 (diff)
parent2a888bc3fb72069e735faad42e8325f60a5d7412 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3
-rw-r--r--src/plugins/directshow/common/directshowmediatype.cpp1
-rw-r--r--tests/auto/integration/qaudiooutput/BLACKLIST3
-rw-r--r--tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp14
-rw-r--r--tests/auto/unit/qmediaobject/tst_qmediaobject.cpp4
4 files changed, 2 insertions, 20 deletions
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index 103f1ddc..37106586 100644
--- a/src/plugins/directshow/common/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
@@ -294,6 +294,7 @@ int DirectShowMediaType::bytesPerLine(const QVideoSurfaceFormat &format)
return format.frameWidth() * 4;
// 24 bpp packed formats.
case QVideoFrame::Format_RGB24:
+ case QVideoFrame::Format_BGR24:
return PAD_TO_DWORD(format.frameWidth() * 3);
// 16 bpp packed formats.
case QVideoFrame::Format_RGB565:
diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST
index c83b3041..966b48af 100644
--- a/tests/auto/integration/qaudiooutput/BLACKLIST
+++ b/tests/auto/integration/qaudiooutput/BLACKLIST
@@ -1,2 +1 @@
-[pullSuspendResume]
-opensuse-42.3
+linux ci
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index f3a67607..9943ffec 100644
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
@@ -116,8 +116,6 @@ private:
QScopedPointer<QByteArray> m_byteArray;
QScopedPointer<QBuffer> m_buffer;
-
- bool m_inCISystem;
};
QString tst_QAudioOutput::formatToFileName(const QAudioFormat &format)
@@ -190,9 +188,6 @@ void tst_QAudioOutput::generate_audiofile_testrows()
QTest::newRow(QString("Audio File %1").arg(i).toLocal8Bit().constData())
<< audioFiles.at(i) << testFormats.at(i);
- // Only run first format in CI system to reduce test times
- if (m_inCISystem)
- break;
}
}
@@ -278,7 +273,6 @@ void tst_QAudioOutput::initTestCase()
file->close();
audioFiles.append(file);
}
- qgetenv("QT_TEST_CI").toInt(&m_inCISystem,10);
}
void tst_QAudioOutput::format()
@@ -549,10 +543,6 @@ void tst_QAudioOutput::pull()
void tst_QAudioOutput::pullSuspendResume()
{
-#ifdef Q_OS_LINUX
- if (m_inCISystem)
- QSKIP("QTBUG-26504 Fails 20% of time with pulseaudio backend");
-#endif
QFETCH(FilePtr, audioFile);
QFETCH(QAudioFormat, audioFormat);
QAudioOutput audioOutput(audioFormat, this);
@@ -726,10 +716,6 @@ void tst_QAudioOutput::push()
void tst_QAudioOutput::pushSuspendResume()
{
-#ifdef Q_OS_LINUX
- if (m_inCISystem)
- QSKIP("QTBUG-26504 Fails 20% of time with pulseaudio backend");
-#endif
QFETCH(FilePtr, audioFile);
QFETCH(QAudioFormat, audioFormat);
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
index bf870416..f1d5cc32 100644
--- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
+++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
@@ -297,10 +297,6 @@ void tst_QMediaObject::notifySignals()
timer.start();
QTRY_COMPARE(spy.count(), count);
-
- qint64 elapsed = timer.elapsed();
- int expectedElapsed = count * interval * 3; // give it some margin of error
- QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData());
}
void tst_QMediaObject::notifyInterval_data()