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

Commit 597ce69a authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-dev

parents 9257000c af2645a6

services/camera/libcameraservice/api1/client2/Parameters.cpp

+6 −0
Original line number Diff line number Diff line
@@ -596,6 +596,10 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 
                    supportedSceneModes +=

                        CameraParameters::SCENE_MODE_BARCODE;

                    break;

                case ANDROID_CONTROL_SCENE_MODE_HDR:

                    supportedSceneModes +=

                        CameraParameters::SCENE_MODE_HDR;

                    break;

                default:

                    ALOGW("%s: Camera %d: Unknown scene mode value: %d",

                        __FUNCTION__, cameraId,
@@ -2386,6 +2390,8 @@ int Parameters::sceneModeStringToEnum(const char *sceneMode) { 
            ANDROID_CONTROL_SCENE_MODE_CANDLELIGHT :

        !strcmp(sceneMode, CameraParameters::SCENE_MODE_BARCODE) ?

            ANDROID_CONTROL_SCENE_MODE_BARCODE:

        !strcmp(sceneMode, CameraParameters::SCENE_MODE_HDR) ?

            ANDROID_CONTROL_SCENE_MODE_HDR:

        -1;

}