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

Commit ac4205c9 authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 

This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.

Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
parent 1c1503cf

camera/CameraParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; 
const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";

const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";

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

const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";

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



CameraParameters::CameraParameters()

                : mMap()

include/camera/CameraParameters.h

+8 −6
Original line number Diff line number Diff line
@@ -380,12 +380,14 @@ public: 
    // continuously. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_EDOF[];

    // Continuous auto focus mode. The camera continuously tries to focus. This

    // is ideal for shooting video or shooting photo of moving object. Auto

    // focus starts when the parameter is set. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.  To stop continuous

    // focus, applications should change the focus mode to other modes.

    static const char FOCUS_MODE_CONTINUOUS[];

    // Continuous auto focus mode intended for video recording. The camera

    // continuously tries to focus. This is ideal for shooting video.

    // Applications still can call CameraHardwareInterface.takePicture in this

    // mode but the subject may not be in focus. Auto focus starts when the

    // parameter is set. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode. To stop continuous focus,

    // applications should change the focus mode to other modes.

    static const char FOCUS_MODE_CONTINUOUS_VIDEO[];



private:

    DefaultKeyedVector<String8,String8>    mMap;