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

Commit e6800880 authored by Tom Marshall's avatar Tom Marshall
Browse files

camera: Add required symbols for Oppo devices 

Change-Id: Iaf43f53130963449f4ec6d3116c58965ead1f475
parent ef3711cc

camera/CameraParameters.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -270,6 +270,9 @@ const char CameraParameters::WHITE_BALANCE_DAYLIGHT[] = "daylight"; 
const char CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT[] = "cloudy-daylight";

const char CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT[] = "cloudy-daylight";

const char CameraParameters::WHITE_BALANCE_TWILIGHT[] = "twilight";

const char CameraParameters::WHITE_BALANCE_TWILIGHT[] = "twilight";

const char CameraParameters::WHITE_BALANCE_SHADE[] = "shade";

const char CameraParameters::WHITE_BALANCE_SHADE[] = "shade";

#ifdef OPPO_CAMERA_HARDWARE

const char CameraParameters::WHITE_BALANCE_MANUAL_CCT[] = "manual-cct";

#endif





// Values for effect settings.

// Values for effect settings.

const char CameraParameters::EFFECT_NONE[] = "none";

const char CameraParameters::EFFECT_NONE[] = "none";
@@ -378,6 +381,9 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; 
const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";

const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-picture";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-picture";

#ifdef OPPO_CAMERA_HARDWARE

const char CameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual";

#endif

#if defined(QCOM_HARDWARE)

#if defined(QCOM_HARDWARE)

#ifdef QCOM_LEGACY_CAM_PARAMS

#ifdef QCOM_LEGACY_CAM_PARAMS

const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera";

include/camera/CameraParameters.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -762,6 +762,9 @@ public: 
    static const char WHITE_BALANCE_CLOUDY_DAYLIGHT[];

    static const char WHITE_BALANCE_CLOUDY_DAYLIGHT[];

    static const char WHITE_BALANCE_TWILIGHT[];

    static const char WHITE_BALANCE_TWILIGHT[];

    static const char WHITE_BALANCE_SHADE[];

    static const char WHITE_BALANCE_SHADE[];

#ifdef OPPO_CAMERA_HARDWARE

    static const char WHITE_BALANCE_MANUAL_CCT[];

#endif





    // Values for effect settings.

    // Values for effect settings.

    static const char EFFECT_NONE[];

    static const char EFFECT_NONE[];
@@ -923,6 +926,10 @@ public: 
    // other modes.

    // other modes.

    static const char FOCUS_MODE_CONTINUOUS_PICTURE[];

    static const char FOCUS_MODE_CONTINUOUS_PICTURE[];





#ifdef OPPO_CAMERA_HARDWARE

    static const char FOCUS_MODE_MANUAL_POSITION[];

#endif



    // Values for light special effects

    // Values for light special effects

    // Low-light enhancement mode

    // Low-light enhancement mode

    static const char LIGHTFX_LOWLIGHT[];

    static const char LIGHTFX_LOWLIGHT[];