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

Commit 52aafab9 authored by James Painter's avatar James Painter Committed by Android Git Automerger
Browse files

am 0517e304: DO NOT MERGE: Remove experimental parameters for burst mode 

* commit '0517e304':
  DO NOT MERGE: Remove experimental parameters for burst mode
parents 650930d9 0517e304

camera/CameraParameters.cpp

+0 −5
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ const char CameraParameters::KEY_RECORDING_HINT[] = "recording-hint"; 
const char CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED[] = "video-snapshot-supported";

const char CameraParameters::KEY_VIDEO_STABILIZATION[] = "video-stabilization";

const char CameraParameters::KEY_VIDEO_STABILIZATION_SUPPORTED[] = "video-stabilization-supported";

const char CameraParameters::KEY_LIGHTFX[] = "light-fx";



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

const char CameraParameters::FALSE[] = "false";
@@ -168,10 +167,6 @@ const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; 
const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";

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



// Values for light fx settings

const char CameraParameters::LIGHTFX_LOWLIGHT[] = "low-light";

const char CameraParameters::LIGHTFX_HDR[] = "high-dynamic-range";



CameraParameters::CameraParameters()

                : mMap()

{

include/camera/CameraParameters.h

+0 −10
Original line number Diff line number Diff line
@@ -525,10 +525,6 @@ public: 
    // stream and record stabilized videos.

    static const char KEY_VIDEO_STABILIZATION_SUPPORTED[];



    // Supported modes for special effects with light.

    // Example values: "lowlight,hdr".

    static const char KEY_LIGHTFX[];



    // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.

    static const char TRUE[];

    static const char FALSE[];
@@ -668,12 +664,6 @@ public: 
    // other modes.

    static const char FOCUS_MODE_CONTINUOUS_PICTURE[];



    // Values for light special effects

    // Low-light enhancement mode

    static const char LIGHTFX_LOWLIGHT[];

    // High-dynamic range mode

    static const char LIGHTFX_HDR[];



private:

    DefaultKeyedVector<String8,String8>    mMap;

};

services/camera/libcameraservice/camera2/Parameters.cpp

+0 −16
Original line number Diff line number Diff line
@@ -1331,10 +1331,6 @@ status_t Parameters::set(const String8& params) { 
        ALOGE("%s: Video stabilization not supported", __FUNCTION__);

    }



    // LIGHTFX

    validatedParams.lightFx = lightFxStringToEnum(

        newParams.get(CameraParameters::KEY_LIGHTFX));



    /** Update internal parameters */



    validatedParams.paramsFlattened = params;
@@ -1746,18 +1742,6 @@ Parameters::Parameters::focusMode_t Parameters::focusModeStringToEnum( 
        Parameters::FOCUS_MODE_INVALID;

}



Parameters::Parameters::lightFxMode_t Parameters::lightFxStringToEnum(

        const char *lightFxMode) {

    return

        !lightFxMode ?

            Parameters::LIGHTFX_NONE :

        !strcmp(lightFxMode, CameraParameters::LIGHTFX_LOWLIGHT) ?

            Parameters::LIGHTFX_LOWLIGHT :

        !strcmp(lightFxMode, CameraParameters::LIGHTFX_HDR) ?

            Parameters::LIGHTFX_HDR :

        Parameters::LIGHTFX_NONE;

}



status_t Parameters::parseAreas(const char *areasCStr,

        Vector<Parameters::Area> *areas) {

    static const size_t NUM_FIELDS = 5;

services/camera/libcameraservice/camera2/Parameters.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ struct Parameters { 
    static int sceneModeStringToEnum(const char *sceneMode);

    static flashMode_t flashModeStringToEnum(const char *flashMode);

    static focusMode_t focusModeStringToEnum(const char *focusMode);

    static lightFxMode_t lightFxStringToEnum(const char *lightFxMode);

    static status_t parseAreas(const char *areasCStr,

            Vector<Area> *areas);

    static status_t validateAreas(const Vector<Area> &areas,