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

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

Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev

parents 498a274c c61b2aaa

camera/CameraParameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ const char CameraParameters::SCENE_MODE_SPORTS[] = "sports"; 
const char CameraParameters::SCENE_MODE_PARTY[] = "party";

const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight";

const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";

const char CameraParameters::SCENE_MODE_HDR[] = "hdr";



const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp";

const char CameraParameters::PIXEL_FORMAT_YUV420SP[] = "yuv420sp";

include/camera/CameraParameters.h

+4 −0
Original line number Diff line number Diff line
@@ -597,6 +597,10 @@ public: 
    // Applications are looking for a barcode. Camera driver will be optimized

    // for barcode reading.

    static const char SCENE_MODE_BARCODE[];

    // A high-dynamic range mode. In this mode, the HAL module will use a

    // capture strategy that extends the dynamic range of the captured

    // image in some fashion. Only the final image is returned.

    static const char SCENE_MODE_HDR[];



    // Pixel color formats for KEY_PREVIEW_FORMAT, KEY_PICTURE_FORMAT,

    // and KEY_VIDEO_FRAME_FORMAT