diff options
Diffstat (limited to 'camera/CameraParameters.cpp')
-rw-r--r-- | camera/CameraParameters.cpp | 342 |
1 files changed, 339 insertions, 3 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index fd91bf2..f41be22 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -26,12 +26,21 @@ namespace android { // Parameter keys to communicate between camera application and driver. const char CameraParameters::KEY_PREVIEW_SIZE[] = "preview-size"; const char CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES[] = "preview-size-values"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_SUPPORTED_HFR_SIZES[] = "hfr-size-values"; +#endif const char CameraParameters::KEY_PREVIEW_FORMAT[] = "preview-format"; const char CameraParameters::KEY_SUPPORTED_PREVIEW_FORMATS[] = "preview-format-values"; const char CameraParameters::KEY_PREVIEW_FRAME_RATE[] = "preview-frame-rate"; const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES[] = "preview-frame-rate-values"; const char CameraParameters::KEY_PREVIEW_FPS_RANGE[] = "preview-fps-range"; const char CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE[] = "preview-fps-range-values"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_PREVIEW_FRAME_RATE_MODE[] = "preview-frame-rate-mode"; +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"; +#endif const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size"; const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values"; const char CameraParameters::KEY_PICTURE_FORMAT[] = "picture-format"; @@ -51,10 +60,20 @@ const char CameraParameters::KEY_WHITE_BALANCE[] = "whitebalance"; const char CameraParameters::KEY_SUPPORTED_WHITE_BALANCE[] = "whitebalance-values"; const char CameraParameters::KEY_EFFECT[] = "effect"; const char CameraParameters::KEY_SUPPORTED_EFFECTS[] = "effect-values"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_TOUCH_AF_AEC[] = "touch-af-aec"; +const char CameraParameters::KEY_SUPPORTED_TOUCH_AF_AEC[] = "touch-af-aec-values"; +const char CameraParameters::KEY_TOUCH_INDEX_AEC[] = "touch-index-aec"; +const char CameraParameters::KEY_TOUCH_INDEX_AF[] = "touch-index-af"; +#endif const char CameraParameters::KEY_ANTIBANDING[] = "antibanding"; const char CameraParameters::KEY_SUPPORTED_ANTIBANDING[] = "antibanding-values"; const char CameraParameters::KEY_SCENE_MODE[] = "scene-mode"; 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 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"; @@ -81,6 +100,28 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported"; const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported"; const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances"; const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_ISO_MODE[] = "iso"; +const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; +const char CameraParameters::KEY_LENSSHADE[] = "lensshade"; +const char CameraParameters::KEY_SUPPORTED_LENSSHADE_MODES[] = "lensshade-values"; +const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure"; +const char CameraParameters::KEY_SUPPORTED_AUTO_EXPOSURE[] = "auto-exposure-values"; +const char CameraParameters::KEY_DENOISE[] = "denoise"; +const char CameraParameters::KEY_SUPPORTED_DENOISE[] = "denoise-values"; +const char CameraParameters::KEY_SELECTABLE_ZONE_AF[] = "selectable-zone-af"; +const char CameraParameters::KEY_SUPPORTED_SELECTABLE_ZONE_AF[] = "selectable-zone-af-values"; +const char CameraParameters::KEY_FACE_DETECTION[] = "face-detection"; +const char CameraParameters::KEY_SUPPORTED_FACE_DETECTION[] = "face-detection-values"; +const char CameraParameters::KEY_MEMORY_COLOR_ENHANCEMENT[] = "mce"; +const char CameraParameters::KEY_SUPPORTED_MEM_COLOR_ENHANCE_MODES[] = "mce-values"; +const char CameraParameters::KEY_VIDEO_HIGH_FRAME_RATE[] = "video-hfr"; +const char CameraParameters::KEY_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES[] = "video-hfr-values"; +const char CameraParameters::KEY_REDEYE_REDUCTION[] = "redeye-reduction"; +const char CameraParameters::KEY_SUPPORTED_REDEYE_REDUCTION[] = "redeye-reduction-values"; +const char CameraParameters::KEY_HIGH_DYNAMIC_RANGE_IMAGING[] = "hdr"; +const char CameraParameters::KEY_SUPPORTED_HDR_IMAGING_MODES[] = "hdr-values"; +#endif const char CameraParameters::KEY_VIDEO_SIZE[] = "video-size"; const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES[] = "video-size-values"; const char CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[] = "preferred-preview-size-for-video"; @@ -88,8 +129,33 @@ const char CameraParameters::KEY_MAX_NUM_DETECTED_FACES_HW[] = "max-num-detected const char CameraParameters::KEY_MAX_NUM_DETECTED_FACES_SW[] = "max-num-detected-faces-sw"; const char CameraParameters::KEY_RECORDING_HINT[] = "recording-hint"; const char CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED[] = "video-snapshot-supported"; +const char CameraParameters::KEY_FULL_VIDEO_SNAP_SUPPORTED[] = "full-video-snap-supported"; const char CameraParameters::KEY_VIDEO_STABILIZATION[] = "video-stabilization"; const char CameraParameters::KEY_VIDEO_STABILIZATION_SUPPORTED[] = "video-stabilization-supported"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_ZSL[] = "zsl"; +const char CameraParameters::KEY_SUPPORTED_ZSL_MODES[] = "zsl-values"; +const char CameraParameters::KEY_CAMERA_MODE[] = "camera-mode"; +const char CameraParameters::KEY_POWER_MODE[] = "power-mode"; +const char CameraParameters::KEY_POWER_MODE_SUPPORTED[] = "power-mode-supported"; +#endif +const char CameraParameters::KEY_AE_BRACKET_HDR[] = "ae-bracket-hdr"; + +/*only effective when KEY_AE_BRACKET_HDR set to ae_bracketing*/ +//const char CameraParameters::KEY_AE_BRACKET_SETTING_KEY[] = "ae-bracket-setting"; + +#ifdef HAVE_ISO +const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; +const char CameraParameters::KEY_ISO_MODE[] = "iso"; +#endif + +#ifdef SAMSUNG_CAMERA_HARDWARE +const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake"; +const char CameraParameters::KEY_METERING[] = "metering"; +const char CameraParameters::KEY_WDR[] = "wdr"; +const char CameraParameters::KEY_WEATHER[] = "weather"; +const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid"; +#endif const char CameraParameters::TRUE[] = "true"; const char CameraParameters::FALSE[] = "false"; @@ -115,6 +181,15 @@ const char CameraParameters::EFFECT_POSTERIZE[] = "posterize"; const char CameraParameters::EFFECT_WHITEBOARD[] = "whiteboard"; const char CameraParameters::EFFECT_BLACKBOARD[] = "blackboard"; const char CameraParameters::EFFECT_AQUA[] = "aqua"; +#ifdef QCOM_HARDWARE +const char CameraParameters::EFFECT_EMBOSS[] = "emboss"; +const char CameraParameters::EFFECT_SKETCH[] = "sketch"; +const char CameraParameters::EFFECT_NEON[] = "neon"; + +// Values for auto exposure settings. +const char CameraParameters::TOUCH_AF_AEC_OFF[] = "touch-off"; +const char CameraParameters::TOUCH_AF_AEC_ON[] = "touch-on"; +#endif // Values for antibanding settings. const char CameraParameters::ANTIBANDING_AUTO[] = "auto"; @@ -130,7 +205,8 @@ const char CameraParameters::FLASH_MODE_RED_EYE[] = "red-eye"; const char CameraParameters::FLASH_MODE_TORCH[] = "torch"; // Values for scene mode settings. -const char CameraParameters::SCENE_MODE_AUTO[] = "auto"; +const char CameraParameters::SCENE_MODE_AUTO[] = "auto"; // corresponds to CAMERA_BESTSHOT_OFF in HAL +const char CameraParameters::SCENE_MODE_ASD[] = "asd"; // corresponds to CAMERA_BESTSHOT_AUTO in HAL const char CameraParameters::SCENE_MODE_ACTION[] = "action"; const char CameraParameters::SCENE_MODE_PORTRAIT[] = "portrait"; const char CameraParameters::SCENE_MODE_LANDSCAPE[] = "landscape"; @@ -145,11 +221,28 @@ const char CameraParameters::SCENE_MODE_FIREWORKS[] = "fireworks"; const char CameraParameters::SCENE_MODE_SPORTS[] = "sports"; const char CameraParameters::SCENE_MODE_PARTY[] = "party"; const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight"; +#ifdef QCOM_HARDWARE +const char CameraParameters::SCENE_MODE_BACKLIGHT[] = "backlight"; +const char CameraParameters::SCENE_MODE_FLOWERS[] = "flowers"; +#endif const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode"; + const char CameraParameters::SCENE_MODE_HDR[] = "hdr"; +#ifdef QCOM_HARDWARE +const char CameraParameters::SCENE_MODE_AR[] = "AR"; + +// Values for auto scene detection settings. +const char CameraParameters::SCENE_DETECT_OFF[] = "off"; +const char CameraParameters::SCENE_DETECT_ON[] = "on"; +#endif + +// Formats for setPreviewFormat and setPictureFormat. const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp"; const char CameraParameters::PIXEL_FORMAT_YUV420SP[] = "yuv420sp"; +#ifdef QCOM_HARDWARE +const char CameraParameters::PIXEL_FORMAT_YUV420SP_ADRENO[] = "yuv420sp-adreno"; +#endif const char CameraParameters::PIXEL_FORMAT_YUV422I[] = "yuv422i-yuyv"; const char CameraParameters::PIXEL_FORMAT_YUV420P[] = "yuv420p"; const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565"; @@ -158,6 +251,12 @@ const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg"; const char CameraParameters::PIXEL_FORMAT_BAYER_RGGB[] = "bayer-rggb"; const char CameraParameters::PIXEL_FORMAT_ANDROID_OPAQUE[] = "android-opaque"; +#ifdef QCOM_HARDWARE +const char CameraParameters::PIXEL_FORMAT_RAW[] = "raw"; +const char CameraParameters::PIXEL_FORMAT_YV12[] = "yuv420p"; +const char CameraParameters::PIXEL_FORMAT_NV12[] = "nv12"; +#endif + // Values for focus mode settings. const char CameraParameters::FOCUS_MODE_AUTO[] = "auto"; const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; @@ -166,6 +265,118 @@ 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) +const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal"; + + +const char CameraParameters::KEY_SKIN_TONE_ENHANCEMENT[] = "skinToneEnhancement"; +const char CameraParameters::KEY_SUPPORTED_SKIN_TONE_ENHANCEMENT_MODES[] = "skinToneEnhancement-values"; + +// Values for ISO Settings +const char CameraParameters::ISO_AUTO[] = "auto"; +const char CameraParameters::ISO_HJR[] = "ISO_HJR"; +const char CameraParameters::ISO_100[] = "ISO100"; +const char CameraParameters::ISO_200[] = "ISO200"; +const char CameraParameters::ISO_400[] = "ISO400"; +const char CameraParameters::ISO_800[] = "ISO800"; +const char CameraParameters::ISO_1600[] = "ISO1600"; +const char CameraParameters::ISO_3200[] = "ISO3200"; +const char CameraParameters::ISO_6400[] = "ISO6400"; + + //Values for Lens Shading +const char CameraParameters::LENSSHADE_ENABLE[] = "enable"; +const char CameraParameters::LENSSHADE_DISABLE[] = "disable"; + +// Values for auto exposure settings. +const char CameraParameters::AUTO_EXPOSURE_FRAME_AVG[] = "frame-average"; +const char CameraParameters::AUTO_EXPOSURE_CENTER_WEIGHTED[] = "center-weighted"; +const char CameraParameters::AUTO_EXPOSURE_SPOT_METERING[] = "spot-metering"; + +const char CameraParameters::KEY_GPS_LATITUDE_REF[] = "gps-latitude-ref"; +const char CameraParameters::KEY_GPS_LONGITUDE_REF[] = "gps-longitude-ref"; +const char CameraParameters::KEY_GPS_ALTITUDE_REF[] = "gps-altitude-ref"; +const char CameraParameters::KEY_GPS_STATUS[] = "gps-status"; +const char CameraParameters::KEY_EXIF_DATETIME[] = "exif-datetime"; + +const char CameraParameters::KEY_HISTOGRAM[] = "histogram"; +const char CameraParameters::KEY_SUPPORTED_HISTOGRAM_MODES[] = "histogram-values"; +//Values for Histogram Shading +const char CameraParameters::HISTOGRAM_ENABLE[] = "enable"; +const char CameraParameters::HISTOGRAM_DISABLE[] = "disable"; + +//Values for Skin Tone Enhancement Modes +const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; +const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable"; + +const char CameraParameters::KEY_SHARPNESS[] = "sharpness"; +const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness"; +const char CameraParameters::KEY_CONTRAST[] = "contrast"; +const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast"; +const char CameraParameters::KEY_SATURATION[] = "saturation"; +const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation"; + +//Values for DENOISE +const char CameraParameters::DENOISE_OFF[] = "denoise-off"; +const char CameraParameters::DENOISE_ON[] = "denoise-on"; +// Values for selectable zone af Settings +const char CameraParameters::SELECTABLE_ZONE_AF_AUTO[] = "auto"; +const char CameraParameters::SELECTABLE_ZONE_AF_SPOT_METERING[] = "spot-metering"; +const char CameraParameters::SELECTABLE_ZONE_AF_CENTER_WEIGHTED[] = "center-weighted"; +const char CameraParameters::SELECTABLE_ZONE_AF_FRAME_AVERAGE[] = "frame-average"; + +// Values for Face Detection settings. +const char CameraParameters::FACE_DETECTION_OFF[] = "off"; +const char CameraParameters::FACE_DETECTION_ON[] = "on"; + +// Values for MCE settings. +const char CameraParameters::MCE_ENABLE[] = "enable"; +const char CameraParameters::MCE_DISABLE[] = "disable"; + +// Values for HFR settings. +const char CameraParameters::VIDEO_HFR_OFF[] = "off"; +const char CameraParameters::VIDEO_HFR_2X[] = "60"; +const char CameraParameters::VIDEO_HFR_3X[] = "90"; +const char CameraParameters::VIDEO_HFR_4X[] = "120"; + +// Values for Redeye Reduction settings. +const char CameraParameters::REDEYE_REDUCTION_ENABLE[] = "enable"; +const char CameraParameters::REDEYE_REDUCTION_DISABLE[] = "disable"; +// Values for HDR settings. +const char CameraParameters::HDR_ENABLE[] = "enable"; +const char CameraParameters::HDR_DISABLE[] = "disable"; + +// Values for ZSL settings. +const char CameraParameters::ZSL_OFF[] = "off"; +const char CameraParameters::ZSL_ON[] = "on"; + +// Values for HDR Bracketing settings. +const char CameraParameters::AE_BRACKET_HDR_OFF[] = "Off"; +const char CameraParameters::AE_BRACKET_HDR[] = "HDR"; +const char CameraParameters::AE_BRACKET[] = "AE-Bracket"; + +const char CameraParameters::LOW_POWER[] = "Low_Power"; +const char CameraParameters::NORMAL_POWER[] = "Normal_Power"; + +static const char* portrait = "portrait"; +static const char* landscape = "landscape"; + +int CameraParameters::getOrientation() const +{ + const char* orientation = get("orientation"); + if (orientation && !strcmp(orientation, portrait)) + return CAMERA_ORIENTATION_PORTRAIT; + return CAMERA_ORIENTATION_LANDSCAPE; +} +void CameraParameters::setOrientation(int orientation) +{ + if (orientation == CAMERA_ORIENTATION_PORTRAIT) { + set("orientation", portrait); + } else { + set("orientation", landscape); + } +} +#endif + CameraParameters::CameraParameters() : mMap() @@ -248,7 +459,7 @@ void CameraParameters::set(const char *key, const char *value) void CameraParameters::set(const char *key, int value) { char str[16]; - sprintf(str, "%d", value); + snprintf(str, sizeof(str), "%d", value); set(key, str); } @@ -275,6 +486,13 @@ int CameraParameters::getInt(const char *key) const return strtol(v, 0, 0); } +#ifdef SAMSUNG_CAMERA_HARDWARE +int CameraParameters::getInt64(const char *key) const +{ + return -1; +} +#endif + float CameraParameters::getFloat(const char *key) const { const char *v = get(key); @@ -313,6 +531,32 @@ static int parse_pair(const char *str, int *first, int *second, char delim, return 0; } +// Parse string like "(1, 2, 3, 4, ..., N)" +// num is pointer to an allocated array of size N +static int parseNDimVector(const char *str, int *num, int N, char delim = ',') +{ + char *start, *end; + if(num == NULL) { + ALOGE("Invalid output array (num == NULL)"); + return -1; + } + //check if string starts and ends with parantheses + if(str[0] != '(' || str[strlen(str)-1] != ')') { + ALOGE("Invalid format of string %s, valid format is (n1, n2, n3, n4 ...)", str); + return -1; + } + start = (char*) str; + start++; + for(int i=0; i<N; i++) { + *(num+i) = (int) strtol(start, &end, 10); + if(*end != delim && i < N-1) { + ALOGE("Cannot find delimeter '%c' in string \"%s\". end = %c", delim, str, *end); + return -1; + } + start = end+1; + } + return 0; +} static void parseSizesList(const char *sizesStr, Vector<Size> &sizes) { if (sizesStr == 0) { @@ -341,7 +585,7 @@ static void parseSizesList(const char *sizesStr, Vector<Size> &sizes) void CameraParameters::setPreviewSize(int width, int height) { char str[32]; - sprintf(str, "%dx%d", width, height); + snprintf(str, sizeof(str), "%dx%d", width, height); set(KEY_PREVIEW_SIZE, str); } @@ -368,6 +612,21 @@ void CameraParameters::getSupportedPreviewSizes(Vector<Size> &sizes) const parseSizesList(previewSizesStr, sizes); } +#ifdef QCOM_HARDWARE +void CameraParameters::getSupportedHfrSizes(Vector<Size> &sizes) const +{ + const char *hfrSizesStr = get(KEY_SUPPORTED_HFR_SIZES); + parseSizesList(hfrSizesStr, sizes); +} + +void CameraParameters::setPreviewFpsRange(int minFPS, int maxFPS) +{ + char str[32]; + snprintf(str, sizeof(str), "%d,%d",minFPS,maxFPS); + set(KEY_PREVIEW_FPS_RANGE,str); +} +#endif + void CameraParameters::setVideoSize(int width, int height) { char str[32]; @@ -407,6 +666,18 @@ void CameraParameters::getPreviewFpsRange(int *min_fps, int *max_fps) const parse_pair(p, min_fps, max_fps, ','); } +#ifdef QCOM_HARDWARE +void CameraParameters::setPreviewFrameRateMode(const char *mode) +{ + set(KEY_PREVIEW_FRAME_RATE_MODE, mode); +} + +const char *CameraParameters::getPreviewFrameRateMode() const +{ + return get(KEY_PREVIEW_FRAME_RATE_MODE); +} +#endif + void CameraParameters::setPreviewFormat(const char *format) { set(KEY_PREVIEW_FORMAT, format); @@ -460,6 +731,71 @@ void CameraParameters::dump() const } } +#ifdef QCOM_HARDWARE +void CameraParameters::setTouchIndexAec(int x, int y) +{ + char str[32]; + snprintf(str, sizeof(str), "%dx%d", x, y); + set(KEY_TOUCH_INDEX_AEC, str); +} + +void CameraParameters::getTouchIndexAec(int *x, int *y) const +{ + *x = -1; + *y = -1; + + // Get the current string, if it doesn't exist, leave the -1x-1 + const char *p = get(KEY_TOUCH_INDEX_AEC); + if (p == 0) + return; + + int tempX, tempY; + if (parse_pair(p, &tempX, &tempY, 'x') == 0) { + *x = tempX; + *y = tempY; + } +} + +void CameraParameters::setTouchIndexAf(int x, int y) +{ + char str[32]; + snprintf(str, sizeof(str), "%dx%d", x, y); + set(KEY_TOUCH_INDEX_AF, str); +} + +void CameraParameters::getMeteringAreaCenter(int *x, int *y) const +{ + //Default invalid values + *x = -2000; + *y = -2000; + + const char *p = get(KEY_METERING_AREAS); + if(p != NULL) { + int arr[5] = {-2000, -2000, -2000, -2000, 0}; + parseNDimVector(p, arr, 5); //p = "(x1, y1, x2, y2, weight)" + *x = (arr[0] + arr[2])/2; //center_x = (x1+x2)/2 + *y = (arr[1] + arr[3])/2; //center_y = (y1+y2)/2 + } +} + +void CameraParameters::getTouchIndexAf(int *x, int *y) const +{ + *x = -1; + *y = -1; + + // Get the current string, if it doesn't exist, leave the -1x-1 + const char *p = get(KEY_TOUCH_INDEX_AF); + if (p == 0) + return; + + int tempX, tempY; + if (parse_pair(p, &tempX, &tempY, 'x') == 0) { + *x = tempX; + *y = tempY; + } +} +#endif + status_t CameraParameters::dump(int fd, const Vector<String16>& args) const { const size_t SIZE = 256; |