diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-10-04 16:50:15 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-12 16:16:10 +0000 |
| commit | 2736050df2e3c5d500f8970746e26e8cc2836543 (patch) | |
| tree | d509e3621b3fb03a83fdb83a662c654f81abecfd /tests | |
| parent | 47b6a81a318f7f9deec98724968684023a23d213 (diff) | |
Fix QCameraBackend::testNativeMetadata() on gstreamer
Let it record a bit, otherwise we don't get anything. Don't check
QMediaMetaData::Date, as some encoders set that on their own. Instead
use Language and fix issues in correctly writing the language.
Change-Id: Ib5e2bacc053814afc2fafdae65330950e591d6fc
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 839cb46628b197d0a851c78d518186881e047272)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 4bad5bbcf..91cdcef3c 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -638,9 +638,10 @@ void tst_QCameraBackend::testNativeMetadata() QTRY_VERIFY(camera.isActive()); // Insert common metadata supported on all platforms + // Don't use Date, as some backends set that on their own QMediaMetaData metaData; metaData.insert(QMediaMetaData::Title, QString::fromUtf8("Title")); - metaData.insert(QMediaMetaData::Date, QDate::currentDate()); + metaData.insert(QMediaMetaData::Language, QVariant::fromValue(QLocale::German)); metaData.insert(QMediaMetaData::Description, QString::fromUtf8("Description")); recorder.setMetaData(metaData); @@ -676,7 +677,9 @@ void tst_QCameraBackend::testNativeMetadata() QTRY_VERIFY(metadataChangedSpy.count() > 0); QCOMPARE(player.metaData().value(QMediaMetaData::Title).toString(), metaData.value(QMediaMetaData::Title).toString()); - QCOMPARE(player.metaData().value(QMediaMetaData::Date).toDateTime(), metaData.value(QMediaMetaData::Date).toDateTime()); + auto lang = player.metaData().value(QMediaMetaData::Language).value<QLocale::Language>(); + if (lang != QLocale::AnyLanguage) + QCOMPARE(lang, metaData.value(QMediaMetaData::Language).value<QLocale::Language>()); QCOMPARE(player.metaData().value(QMediaMetaData::Description).toString(), metaData.value(QMediaMetaData::Description).toString()); metadataChangedSpy.clear(); |