Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.

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";

// Formats for setPreviewFormat and setPictureFormat.

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

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";

CameraParameters::CameraParameters()

                : mMap()

    static const char SCENE_MODE_SPORTS[];

    static const char SCENE_MODE_PARTY[];

    static const char SCENE_MODE_CANDLELIGHT[];

    // Applications are looking for a barcode. Camera driver will be optimized

    // for barcode reading.

    static const char SCENE_MODE_BARCODE[];

    // Formats for setPreviewFormat and setPictureFormat.

    static const char PIXEL_FORMAT_YUV422SP[];

    // focus, which is usually at hyperfocal distance. Applications should

    // not call CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_FIXED[];

    // Extended depth of field (EDOF). Focusing is done digitally and

    // continuously. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_EDOF[];

private:

    DefaultKeyedVector<String8,String8>    mMap;