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

Commit bd3a8712 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove flag "concert_mode"" into main

parents f53f048d af99c37d

services/camera/libcameraservice/device3/DistortionMapper.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -43,10 +43,8 @@ void DistortionMapper::initRemappedKeys() { 
            kResultPointsToCorrectNoClamp.begin(),

            kResultPointsToCorrectNoClamp.begin(),

            kResultPointsToCorrectNoClamp.end());

            kResultPointsToCorrectNoClamp.end());

    mRemappedKeys.insert(ANDROID_DISTORTION_CORRECTION_MODE);

    mRemappedKeys.insert(ANDROID_DISTORTION_CORRECTION_MODE);

    if (flags::concert_mode()) {

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

}

}

}





bool DistortionMapper::isDistortionSupported(const CameraMetadata &deviceInfo) {

bool DistortionMapper::isDistortionSupported(const CameraMetadata &deviceInfo) {

    bool isDistortionCorrectionSupported = false;

    bool isDistortionCorrectionSupported = false;

services/camera/libcameraservice/device3/RotateAndCropMapper.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -37,10 +37,8 @@ void RotateAndCropMapper::initRemappedKeys() { 




    mRemappedKeys.insert(ANDROID_SCALER_ROTATE_AND_CROP);

    mRemappedKeys.insert(ANDROID_SCALER_ROTATE_AND_CROP);

    mRemappedKeys.insert(ANDROID_SCALER_CROP_REGION);

    mRemappedKeys.insert(ANDROID_SCALER_CROP_REGION);

    if (flags::concert_mode()) {

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

}

}

}





bool RotateAndCropMapper::isNeeded(const CameraMetadata* deviceInfo) {

bool RotateAndCropMapper::isNeeded(const CameraMetadata* deviceInfo) {

    auto entry = deviceInfo->find(ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES);

    auto entry = deviceInfo->find(ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES);

services/camera/libcameraservice/device3/ZoomRatioMapper.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -38,10 +38,8 @@ void ZoomRatioMapper::initRemappedKeys() { 
            kResultPointsToCorrectNoClamp.end());

            kResultPointsToCorrectNoClamp.end());





    mRemappedKeys.insert(ANDROID_CONTROL_ZOOM_RATIO);

    mRemappedKeys.insert(ANDROID_CONTROL_ZOOM_RATIO);

    if (flags::concert_mode()) {

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

    mRemappedKeys.insert(ANDROID_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION);

}

}

}





status_t ZoomRatioMapper::initZoomRatioInTemplate(CameraMetadata *request) {

status_t ZoomRatioMapper::initZoomRatioInTemplate(CameraMetadata *request) {

    camera_metadata_entry_t entry;

    camera_metadata_entry_t entry;