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

Commit 53f39838 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Add missing symbols for HTC 8660 camera HAL." into ics

parents 1d73f2b8 00043fb9

include/camera/CameraParameters.h

+21 −0
Original line number Diff line number Diff line
@@ -178,6 +178,15 @@ public: 
    static const char KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[];

    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_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_HDR[];

    static const char CAPTURE_MODE_HJR[];

    static const char CAPTURE_MODE_PANORAMA[];

#endif

    // The dimensions for captured pictures in pixels (width x height).

    // Example value: "1024x768". Read/write.
@@ -716,6 +725,7 @@ public: 
    static const char SCENE_MODE_BACKLIGHT[];

    static const char SCENE_MODE_FLOWERS[];

    static const char SCENE_MODE_AR[];

    static const char SCENE_MODE_OFF[];

#endif

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

    // for barcode reading.
@@ -798,6 +808,16 @@ public: 
    static const char FOCUS_MODE_CONTINUOUS_PICTURE[];



#ifdef QCOM_HARDWARE

    static const char FOCUS_MODE_CONTINUOUS_CAMERA[];



    // Values for Continuous AF

    static const char CAF_OFF[] ;

    static const char CAF_ON[] ;

    // Proprietaries from CodeAurora use these...

    static const char CONTINUOUS_AF_OFF[] ;

    static const char CONTINUOUS_AF_ON[] ;

    static const char KEY_CONTINUOUS_AF[] ;



    // Normal focus mode. Applications should call

    // CameraHardwareInterface.autoFocus to start the focus in this mode.

    static const char FOCUS_MODE_NORMAL[];
@@ -889,6 +909,7 @@ public: 
    int getOrientation() const;

    void setOrientation(int orientation);

    void setPreviewFpsRange(int minFPS,int maxFPS);

    void setPostviewSize(int x,int y);

    void getSupportedHfrSizes(Vector<Size> &sizes) const;

#endif

libs/camera/CameraParameters.cpp

+25 −2
Original line number Diff line number Diff line
@@ -40,6 +40,22 @@ const char CameraParameters::KEY_PREVIEW_FRAME_RATE_MODE[] = "preview-frame-rate 
const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[] = "preview-frame-rate-modes";

const char CameraParameters::KEY_PREVIEW_FRAME_RATE_AUTO_MODE[] = "frame-rate-auto";

const char CameraParameters::KEY_PREVIEW_FRAME_RATE_FIXED_MODE[] = "frame-rate-fixed";

//Values for Continuous AF

const char CameraParameters::CAF_OFF[] = "caf-off";

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_HDR[] = "hdr";

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

const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama";    

const char CameraParameters::CONTINUOUS_AF_OFF[] = "caf-off";

const char CameraParameters::CONTINUOUS_AF_ON[] = "caf-on";

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

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

#endif

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

const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";
@@ -73,7 +89,7 @@ const char CameraParameters::KEY_SUPPORTED_SCENE_MODES[] = "scene-mode-values"; 
#ifdef QCOM_HARDWARE

const char CameraParameters::KEY_SCENE_DETECT[] = "scene-detect";

const char CameraParameters::KEY_SUPPORTED_SCENE_DETECT[] = "scene-detect-values";

#endif QCOM_HARDWARE

#endif

const char CameraParameters::KEY_FLASH_MODE[] = "flash-mode";

const char CameraParameters::KEY_SUPPORTED_FLASH_MODES[] = "flash-mode-values";

const char CameraParameters::KEY_FOCUS_MODE[] = "focus-mode";
@@ -212,6 +228,7 @@ const char CameraParameters::SCENE_MODE_FLOWERS[] = "flowers"; 
const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";

#ifdef QCOM_HARDWARE

const char CameraParameters::SCENE_MODE_AR[] = "AR";

const char CameraParameters::SCENE_MODE_OFF[] = "off";



// Values for auto scene detection settings.

const char CameraParameters::SCENE_DETECT_OFF[] = "off";
@@ -244,7 +261,8 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; 
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";

#if defined(QCOM_HARDWARE)

#ifdef QCOM_HARDWARE

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

const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal";
@@ -549,6 +567,11 @@ static void parseSizesList(const char *sizesStr, Vector<Size> &sizes) 
    }

}



void CameraParameters::setPostviewSize(int width, int height)

{

    // dummy

}



void CameraParameters::setPreviewSize(int width, int height)

{

    char str[32];