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

Commit 982c8a37 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: Reduced Quad Bayer support." into udc-dev

parents 69159de7 dbd1efb0

camera/ndk/include/camera/NdkCameraMetadataTags.h

+75 −25
Original line number Diff line number Diff line
@@ -545,7 +545,9 @@ typedef enum acamera_metadata_tag { 
     * mode.</p>

     * <p>For camera devices with the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability,

     * capability or devices where

     * <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a>

     * ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION must be used as the

     * coordinate system for requests where ACAMERA_SENSOR_PIXEL_MODE is set to
@@ -754,7 +756,10 @@ typedef enum acamera_metadata_tag { 
     * mode.</p>

     * <p>For camera devices with the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability, ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * capability or devices where

     * <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a>,

     * ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION must be used as the

     * coordinate system for requests where ACAMERA_SENSOR_PIXEL_MODE is set to

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.</p>
@@ -957,7 +962,10 @@ typedef enum acamera_metadata_tag { 
     * mode.</p>

     * <p>For camera devices with the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability, ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * capability or devices where

     * <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a>,

     * ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION must be used as the

     * coordinate system for requests where ACAMERA_SENSOR_PIXEL_MODE is set to

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.</p>
@@ -3823,7 +3831,9 @@ typedef enum acamera_metadata_tag { 
     * ACAMERA_CONTROL_ZOOM_RATIO for details.</p>

     * <p>For camera devices with the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability, ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * capability or devices where <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a></p>

     * <p>ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /

     * ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION must be used as the

     * coordinate system for requests where ACAMERA_SENSOR_PIXEL_MODE is set to

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.</p>
@@ -5364,13 +5374,10 @@ typedef enum acamera_metadata_tag { 
     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_DEFAULT">CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT</a> mode.

     * When operating in

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_DEFAULT">CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT</a> mode, sensors

     * with <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability would typically perform pixel binning in order to improve low light

     * would typically perform pixel binning in order to improve low light

     * performance, noise reduction etc. However, in

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>

     * mode (supported only

     * by <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * sensors), sensors typically operate in unbinned mode allowing for a larger image size.

     * mode, sensors typically operate in unbinned mode allowing for a larger image size.

     * The stream configurations supported in

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>

     * mode are also different from those of
@@ -5384,7 +5391,36 @@ typedef enum acamera_metadata_tag { 
     * <code>android.scaler.streamConfigurationMap</code>

     * must not be mixed in the same CaptureRequest. In other words, these outputs are

     * exclusive to each other.

     * This key does not need to be set for reprocess requests.</p>

     * This key does not need to be set for reprocess requests.

     * This key will be be present on devices supporting the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability. It may also be present on devices which do not support the aforementioned

     * capability. In that case:</p>

     * <ul>

     * <li>

     * <p>The mandatory stream combinations listed in

     *   <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics/mandatoryMaximumResolutionStreamCombinations.html">mandatoryMaximumResolutionStreamCombinations</a>

     *   would not apply.</p>

     * </li>

     * <li>

     * <p>The bayer pattern of {@code RAW} streams when

     *   <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>

     *   is selected will be the one listed in <a href="https://developer.android.com/reference/android/sensor/info/binningFactor.html">binningFactor</a>.</p>

     * </li>

     * <li>

     * <p>The following keys will always be present:</p>

     * <ul>

     * <li>android.scaler.streamConfigurationMapMaximumResolution</li>

     * <li>ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION</li>

     * <li>ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION</li>

     * <li>ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION</li>

     * </ul>

     * </li>

     * </ul>

     *

     * @see ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     */

    ACAMERA_SENSOR_PIXEL_MODE =                                 // byte (acamera_metadata_enum_android_sensor_pixel_mode_t)

            ACAMERA_SENSOR_START + 32,
@@ -5729,7 +5765,8 @@ typedef enum acamera_metadata_tag { 
     * counterparts.

     * This key will only be present for devices which advertise the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability.</p>

     * capability or devices where <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a></p>

     * <p>The data representation is <code>int[4]</code>, which maps to <code>(left, top, width, height)</code>.</p>

     *

     * @see ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE
@@ -5761,7 +5798,8 @@ typedef enum acamera_metadata_tag { 
     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.

     * This key will only be present for devices which advertise the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability.</p>

     * capability or devices where <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a></p>

     *

     * @see ACAMERA_SENSOR_INFO_PHYSICAL_SIZE

     * @see ACAMERA_SENSOR_PIXEL_MODE
@@ -5789,7 +5827,8 @@ typedef enum acamera_metadata_tag { 
     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.

     * This key will only be present for devices which advertise the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability.</p>

     * capability or devices where <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     * lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a></p>

     * <p>The data representation is <code>int[4]</code>, which maps to <code>(left, top, width, height)</code>.</p>

     *

     * @see ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE
@@ -5814,12 +5853,27 @@ typedef enum acamera_metadata_tag { 
     * to improve various aspects of imaging such as noise reduction, low light

     * performance etc. These groups can be of various sizes such as 2X2 (quad bayer),

     * 3X3 (nona-bayer). This key specifies the length and width of the pixels grouped under

     * the same color filter.</p>

     * <p>This key will not be present if REMOSAIC_REPROCESSING is not supported, since RAW images

     * will have a regular bayer pattern.</p>

     * <p>This key will not be present for sensors which don't have the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability.</p>

     * the same color filter.

     * In case the device has the

     * <a href="https://developer.android.com/reference/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability :</p>

     * <ul>

     * <li>This key will not be present if REMOSAIC_REPROCESSING is not supported, since RAW

     *   images will have a regular bayer pattern.</li>

     * </ul>

     * <p>In case the device does not have the

     * <a href="https://developer.android.com/reference/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>

     * capability :</p>

     * <ul>

     * <li>This key will be present if

     *   <a href="https://developer.android.com/reference/CameraCharacteristics.html#getAvailableCaptureRequestKeys">CameraCharacteristics#getAvailableCaptureRequestKeys</a>

     *   lists <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a>, since RAW

     *   images may not necessarily have a regular bayer pattern when

     *   <a href="https://developer.android.com/reference/CaptureRequest.html#SENSOR_PIXEL_MODE">ACAMERA_SENSOR_PIXEL_MODE</a> is set to

     *   <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.</li>

     * </ul>

     *

     * @see ACAMERA_SENSOR_PIXEL_MODE

     */

    ACAMERA_SENSOR_INFO_BINNING_FACTOR =                        // int32[2]

            ACAMERA_SENSOR_INFO_START + 14,
@@ -10449,16 +10503,12 @@ typedef enum acamera_metadata_enum_acamera_sensor_test_pattern_mode { 
// ACAMERA_SENSOR_PIXEL_MODE

typedef enum acamera_metadata_enum_acamera_sensor_pixel_mode {

    /**

     * <p>This is the default sensor pixel mode. This is the only sensor pixel mode

     * supported unless a camera device advertises

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.</p>

     * <p>This is the default sensor pixel mode.</p>

     */

    ACAMERA_SENSOR_PIXEL_MODE_DEFAULT                                = 0,















    /**













     * <p>This sensor pixel mode is offered by devices with capability













     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.













     * In this mode, sensors typically do not bin pixels, as a result can offer larger













     * <p>In this mode, sensors typically do not bin pixels, as a result can offer larger















     * image sizes.</p>















     */















    ACAMERA_SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION                     = 1,

























services/camera/libcameraservice/api2/CameraDeviceClient.cpp



+4
−4




























Original line number
Diff line number
Diff line








@@ -191,11 +191,11 @@ status_t CameraDeviceClient::initializeImpl(TProviderPtr providerPtr, const Stri













    // Cache physical camera ids corresponding to this device and also the high















    // resolution sensors in this device + physical camera ids















    mProviderManager->isLogicalCamera(mCameraIdStr.string(), &mPhysicalCameraIds);













    if (isUltraHighResolutionSensor(mCameraIdStr)) {













    if (supportsUltraHighResolutionCapture(mCameraIdStr)) {















        mHighResolutionSensors.insert(mCameraIdStr.string());















    }















    for (auto &physicalId : mPhysicalCameraIds) {













        if (isUltraHighResolutionSensor(String8(physicalId.c_str()))) {













        if (supportsUltraHighResolutionCapture(String8(physicalId.c_str()))) {















            mHighResolutionSensors.insert(physicalId.c_str());















        }















    }










@@ -2259,9 +2259,9 @@ const CameraMetadata &CameraDeviceClient::getStaticInfo(const String8 &cameraId)













    return mDevice->infoPhysical(cameraId);















}





























bool CameraDeviceClient::isUltraHighResolutionSensor(const String8 &cameraId) {













bool CameraDeviceClient::supportsUltraHighResolutionCapture(const String8 &cameraId) {















    const CameraMetadata &deviceInfo = getStaticInfo(cameraId);













    return SessionConfigurationUtils::isUltraHighResolutionSensor(deviceInfo);













    return SessionConfigurationUtils::supportsUltraHighResolutionCapture(deviceInfo);















}































bool CameraDeviceClient::isSensorPixelModeConsistent(

































services/camera/libcameraservice/api2/CameraDeviceClient.h



+1
−1




























Original line number
Diff line number
Diff line








@@ -242,7 +242,7 @@ protected:













    // Calculate the ANativeWindow transform from android.sensor.orientation















    status_t              getRotationTransformLocked(int mirrorMode, /*out*/int32_t* transform);





























    bool isUltraHighResolutionSensor(const String8 &cameraId);













    bool supportsUltraHighResolutionCapture(const String8 &cameraId);































    bool isSensorPixelModeConsistent(const std::list<int> &streamIdList,















            const CameraMetadata &settings);

































services/camera/libcameraservice/api2/DepthCompositeStream.cpp



+2
−2




























Original line number
Diff line number
Diff line








@@ -98,7 +98,7 @@ DepthCompositeStream::DepthCompositeStream(sp<CameraDeviceBase> device,













        }































        getSupportedDepthSizes(staticInfo, /*maxResolution*/false, &mSupportedDepthSizes);













        if (SessionConfigurationUtils::isUltraHighResolutionSensor(staticInfo)) {













        if (SessionConfigurationUtils::supportsUltraHighResolutionCapture(staticInfo)) {















            getSupportedDepthSizes(staticInfo, true, &mSupportedDepthSizesMaximumResolution);















        }















    }










@@ -901,7 +901,7 @@ status_t DepthCompositeStream::getCompositeStreamInfo(const OutputStreamInfo &st













        return BAD_VALUE;















    }





























    if (SessionConfigurationUtils::isUltraHighResolutionSensor(ch)) {













    if (SessionConfigurationUtils::supportsUltraHighResolutionCapture(ch)) {















        getSupportedDepthSizes(ch, /*maxResolution*/true, &depthSizesMaximumResolution);















        if (depthSizesMaximumResolution.empty()) {















            ALOGE("%s: No depth stream configurations for maximum resolution present",

































services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp



+2
−2




























Original line number
Diff line number
Diff line








@@ -506,8 +506,8 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3(













        ALOGE("%s: Unable to derive Jpeg/R tags based on camera and media capabilities: %s (%d)",















                __FUNCTION__, strerror(-res), res);















    }



























    if (camera3::SessionConfigurationUtils::isUltraHighResolutionSensor(mCameraCharacteristics)) {













    using camera3::SessionConfigurationUtils::supportsUltraHighResolutionCapture;













    if (supportsUltraHighResolutionCapture(mCameraCharacteristics)) {















        status_t status = addDynamicDepthTags(/*maxResolution*/true);















        if (OK != status) {















            ALOGE("%s: Failed appending dynamic depth tags for maximum resolution mode: %s (%d)",