diff options
author | Doris Verria <doris.verria@qt.io> | 2021-05-20 19:20:46 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-23 14:05:07 +0000 |
commit | 6bbbd6754de580c67839257e0e98f51ac676b571 (patch) | |
tree | 26935388172560e226dae777e753483ffa8d1d7c | |
parent | e4bf3c4421e09d1ce9abc6d79b07dfa9f43cfb9d (diff) |
Fix tst_qcamerabackend failures for macOS and iOS
- Blacklist testCameraStartParallel on iOS as it doesn't seem to
support two active capture sessions at the same time.
- Fix some erroneous values.
- Add some missing keys to the Info.plist.
* Blacklist testCameraCaptureMetaData for macOS/iOS for now as it's
not yet implemented.
Change-Id: If889b7e4537c4f08ea810926420da59bd985e8e1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
4 files changed, 46 insertions, 19 deletions
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm index 7ff93b126..6e2859acd 100644 --- a/src/multimedia/platform/darwin/qdarwinmediadevices.mm +++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm @@ -254,7 +254,7 @@ void QDarwinMediaDevices::updateCameraDevices() QList<QCameraFormat> videoFormats; for (AVCaptureDeviceFormat *format in device.formats) { - if (![format.mediaType isEqualTo:AVMediaTypeVideo]) + if (![format.mediaType isEqualToString:AVMediaTypeVideo]) continue; auto dimensions = CMVideoFormatDescriptionGetDimensions(format.formatDescription); diff --git a/tests/auto/integration/qcamerabackend/BLACKLIST b/tests/auto/integration/qcamerabackend/BLACKLIST new file mode 100644 index 000000000..725d3ffa4 --- /dev/null +++ b/tests/auto/integration/qcamerabackend/BLACKLIST @@ -0,0 +1,6 @@ +[testCameraCaptureMetadata] +osx +ios + +[testCameraStartParallel] +ios diff --git a/tests/auto/integration/qcamerabackend/Info.plist b/tests/auto/integration/qcamerabackend/Info.plist index 30623235f..590080a1f 100644 --- a/tests/auto/integration/qcamerabackend/Info.plist +++ b/tests/auto/integration/qcamerabackend/Info.plist @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>CFBundleDisplayName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIdentifier</key> - <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> + <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> + <key>CFBundleIdentifier</key> + <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> + <key>CFBundleExecutable</key> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> + <key>CFBundleVersion</key> <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> <key>CFBundleShortVersionString</key> @@ -17,9 +21,26 @@ <key>CFBundleLongVersionString</key> <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> - <key>NSCameraUsageDescription</key> - <string>Qt Multimedia Test</string> - <key>NSMicrophoneUsageDescription</key> - <string>Qt Multimedia Test</string> + <key>LSMinimumSystemVersion</key> + <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string> + + <key>CFBundleGetInfoString</key> + <string>${MACOSX_BUNDLE_INFO_STRING}</string> + <key>NSHumanReadableCopyright</key> + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> + + <key>CFBundleIconFile</key> + <string>${MACOSX_BUNDLE_ICON_FILE}</string> + + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + + <key>NSCameraUsageDescription</key> + <string>Qt Multimedia Test</string> + <key>NSMicrophoneUsageDescription</key> + <string>Qt Multimedia Test</string> + + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> </dict> </plist> diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 1db116d7b..fd2b03429 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -375,13 +375,13 @@ void tst_QCameraBackend::testExposureCompensation() camera.start(); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); - QCOMPARE(camera.exposureCompensation(), -1.0); + QCOMPARE(camera.exposureCompensation(), 1.0); exposureCompensationSignal.clear(); - camera.setExposureCompensation(1.0); - QCOMPARE(camera.exposureCompensation(), 1.0); + camera.setExposureCompensation(-1.0); + QCOMPARE(camera.exposureCompensation(), -1.0); QTRY_COMPARE(exposureCompensationSignal.count(), 1); - QCOMPARE(exposureCompensationSignal.last().first().toReal(), 1.0); + QCOMPARE(exposureCompensationSignal.last().first().toReal(), -1.0); } void tst_QCameraBackend::testExposureMode() @@ -398,7 +398,7 @@ void tst_QCameraBackend::testExposureMode() camera.setExposureMode(QCamera::ExposureNight); QCOMPARE(camera.exposureMode(), QCamera::ExposureNight); camera.start(); - QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QVERIFY(camera.isActive()); QCOMPARE(camera.exposureMode(), QCamera::ExposureNight); } @@ -409,7 +409,7 @@ void tst_QCameraBackend::testExposureMode() camera.setExposureMode(QCamera::ExposureAuto); QCOMPARE(camera.exposureMode(), QCamera::ExposureAuto); camera.start(); - QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QVERIFY(camera.isActive()); QCOMPARE(camera.exposureMode(), QCamera::ExposureAuto); // Manual |