diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-09-13 14:13:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-14 13:40:57 +0000 |
| commit | 82a3624ac4d0602f0d4f45aea0c537a88c34036e (patch) | |
| tree | ad2e3b6cac95894abf08686d895ef16b6680626e | |
| parent | b81edd29b5d5aa4ea6fa050e580c2720c180aa1d (diff) | |
Android: Add check for Camera supported output sizes
According documentation[0] getOutputSizes method can return null if the
format is not supported output. That is why Array returned by this
method should not be used without check.
[0]https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputSizes(int)
Fixes: QTBUG-115935
Change-Id: Ia79d6415bc89c2a37d001d73c2d1c201e92ea79a
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 4d765429297654308522ccc17d6a50c27ab2d6fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 78d1f7327c2e723d1ddc323d700c11a6b96b99b8)
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/multimedia/QtVideoDeviceManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/multimedia/QtVideoDeviceManager.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtVideoDeviceManager.java index 255d1e504..da30080e4 100644 --- a/src/android/jar/src/org/qtproject/qt/android/multimedia/QtVideoDeviceManager.java +++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtVideoDeviceManager.java @@ -110,6 +110,8 @@ public class QtVideoDeviceManager { StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); Size[] sizes = map.getOutputSizes(imageFormat); + if (sizes == null) + return new String[0]; String[] stream = new String[sizes.length]; |