Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86298a90 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Handle Jpeg_R size querie for basic extensions 

Basic extension currently do not have way to generate
and output Jpeg_R/UltraHDR images.
Check and return an empty size list in this particular
scenario.

Bug: 311151367
Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java
atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I505d8462563f14e767b231c313e364ed5c3ab55b
parent 02fcb435

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+6 −0
Original line number Diff line number Diff line
@@ -736,6 +736,9 @@ public final class CameraExtensionCharacteristics { 
                    return generateJpegSupportedSizes(

                            extenders.second.getSupportedPostviewResolutions(sz),

                                    streamMap);

                }  else if (format == ImageFormat.JPEG_R) {

                    // Jpeg_R/UltraHDR is currently not supported in the basic extension case

                    return new ArrayList<>();

                } else {

                    throw new IllegalArgumentException("Unsupported format: " + format);

                }
@@ -891,6 +894,9 @@ public final class CameraExtensionCharacteristics { 
                        } else {

                            return generateSupportedSizes(null, format, streamMap);

                        }

                    } else if (format == ImageFormat.JPEG_R) {

                        // Jpeg_R/UltraHDR is currently not supported in the basic extension case

                        return new ArrayList<>();

                    } else {

                        throw new IllegalArgumentException("Unsupported format: " + format);

                    }