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

Commit 48fd65dc authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "camera: Add parameters for HTC msm8960" into ics

parents f130b1b8 dc4a6eb7

include/camera/CameraParameters.h

+11 −0
Original line number Diff line number Diff line
@@ -179,11 +179,13 @@ public: 
    static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[];

    static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[];

    static const char KEY_CAPTURE_MODE[];

    static const char KEY_SUPPORTED_CAPTURE_MODES[];

    static const char KEY_PICTURE_COUNT[];

    static const char KEY_MAX_BURST_PICTURE_COUNT[];

    static const char KEY_SUPPORTED_CONTINUOUS_AF[];

    static const char CAPTURE_MODE_NORMAL[];

    static const char CAPTURE_MODE_BURST[];

    static const char CAPTURE_MODE_CONTI_BURST[];

    static const char CAPTURE_MODE_HDR[];

    static const char CAPTURE_MODE_HJR[];

    static const char CAPTURE_MODE_PANORAMA[];
@@ -845,10 +847,19 @@ public: 


    static const char KEY_SHARPNESS[];

    static const char KEY_MAX_SHARPNESS[];

#ifdef QCOM_HARDWARE

    static const char KEY_MIN_SHARPNESS[];

#endif

    static const char KEY_CONTRAST[];

    static const char KEY_MAX_CONTRAST[];

#ifdef QCOM_HARDWARE

    static const char KEY_MIN_CONTRAST[];

#endif

    static const char KEY_SATURATION[];

    static const char KEY_MAX_SATURATION[];

#ifdef QCOM_HARDWARE

    static const char KEY_MIN_SATURATION[];

#endif



    static const char KEY_HISTOGRAM[] ;

    static const char KEY_SUPPORTED_HISTOGRAM_MODES[] ;

libs/camera/CameraParameters.cpp

+17 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ const char CameraParameters::CAF_ON[] = "caf-on"; 
//Same, for CodeAurora-based blobs

const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal";

const char CameraParameters::CAPTURE_MODE_BURST[] = "burst";

const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst";

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

const char CameraParameters::CAPTURE_MODE_HJR[] = "hjr";

const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama";
@@ -56,6 +57,7 @@ const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode"; 
const char CameraParameters::KEY_PICTURE_COUNT[] = "picture-count";

const char CameraParameters::KEY_MAX_BURST_PICTURE_COUNT[] = "max-burst-picture-count";

const char CameraParameters::KEY_SUPPORTED_CONTINUOUS_AF[] = "continuous-af-mode";

const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values";

#endif

const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size";

const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";
@@ -309,11 +311,26 @@ const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; 
const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable";



const char CameraParameters::KEY_SHARPNESS[] = "sharpness";

#ifdef QCOM_HARDWARE

const char CameraParameters::KEY_MAX_SHARPNESS[] = "sharpness-max";

const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min";

#else

const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness";

#endif

const char CameraParameters::KEY_CONTRAST[] = "contrast";

#ifdef QCOM_HARDWARE

const char CameraParameters::KEY_MAX_CONTRAST[] = "contrast-max";

const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min";

#else

const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast";

#endif

const char CameraParameters::KEY_SATURATION[] = "saturation";

#ifdef QCOM_HARDWARE

const char CameraParameters::KEY_MAX_SATURATION[] = "saturation-max";

const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min";

#else

const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation";

#endif



//Values for DENOISE

const char CameraParameters::DENOISE_OFF[] = "denoise-off";