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

Commit cefb01ab authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken

parents 2ea200c5 8aba232d

include/camera/CameraParameters.h

+3 −0
Original line number Diff line number Diff line
@@ -253,6 +253,9 @@ public: 
    // Metering mode. This affects how camera determines exposure.

    // Example value: "spot" or METERING_MODE_XXX constants. Read/write.

    static const char KEY_METERING_MODE[];

    // Supported metering modes.

    // Example value: "center-weighted,frame-average,spot". Read only.

    static const char KEY_SUPPORTED_METERING_MODES[];



    // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.

    static const char TRUE[];

libs/camera/CameraParameters.cpp

+4 −3
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte 
const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";

const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";

const char CameraParameters::KEY_METERING_MODE[] = "metering-mode";

const char CameraParameters::KEY_SUPPORTED_METERING_MODES[] = "metering-mode-values";



const char CameraParameters::TRUE[] = "true";

const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
@@ -144,9 +145,9 @@ const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; 
const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";



// Values for metering mode settings.

const char METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";

const char METERING_MODE_FRAME_AVERAGE[] = "frame-average";

const char METERING_MODE_SPOT[] = "spot";

const char CameraParameters::METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";

const char CameraParameters::METERING_MODE_FRAME_AVERAGE[] = "frame-average";

const char CameraParameters::METERING_MODE_SPOT[] = "spot";



CameraParameters::CameraParameters()

                : mMap()