diff --git a/configs/zaf/zaf_mot_imx362.json b/configs/zaf/zaf_mot_imx362.json deleted file mode 100644 index 2cc62b6..0000000 --- a/configs/zaf/zaf_mot_imx362.json +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (C) 2016 Motorola Mobility Inc. - * All Rights Reserved. - * Motorola Mobility Confidential Restricted. - */ -{ - "ZAF_SUPPORTED_CAF": true, - "ZAF_SUPPORTED_PDAF": true, - "ZAF_SUPPORTED_TOF": true, - - "ZAF_ENABLE_CAF": true, - "ZAF_ENABLE_PDAF": true, - "ZAF_ENABLE_TOF": true, - - "ZAF_NEAR_LIMIT": 0, - "ZAF_7CM": 1, - "ZAF_10CM": 115, - "ZAF_14CM": 342, - "ZAF_20CM": 508, - "ZAF_30CM": 635, - "ZAF_40CM": 698, - "ZAF_50CM": 736, - "ZAF_60CM": 760, - "ZAF_120CM": 822, - "ZAF_HYP_F": 864, - "ZAF_1000CM": 884, - "ZAF_INF_LIMIT": 999, - - "ZAF_LENS_REGIONS_NEAR": 0, - "ZAF_LENS_REGIONS_FAR": 12, - - "ZAF_FINE_SCAN_STEP": 25, - - "GYRO_STABLE_CNT_THRESHOLD": 6, - "GYRO_STABLE_DETECT_THRESHOLD": 0.16, - "GYRO_UNSTABLE_CNT_THRESHOLD": 6, - "GYRO_MIN_MOVE_THRESHOLD": 0.20, - "GYRO_SD_STABLE_RATIO": 0.5, - "GYRO_SAMPLE_CNT": 5, - "GYRO_VIDEO_STABLE_CNT_THRESHOLD": 12, - "GYRO_VIDEO_STABLE_DETECT_THRESHOLD": 0.16, - "GYRO_VIDEO_UNSTABLE_CNT_THRESHOLD": 8, - "GYRO_VIDEO_MIN_MOVE_THRESHOLD": 0.20, - "GYRO_VIDEO_SD_STABLE_RATIO": 0.5, - "GYRO_VIDEO_SAMPLE_CNT": 5, - - "AEC_STABLE_PDAF_ENTER": 5.0, - "AEC_STABLE_PDAF_EXIT": 8.0, - "AEC_STABLE_CAF_ENTER": 1.0, - "AEC_STABLE_CAF_EXIT": 3.0, - "AEC_STABLE_VIDEO_PDAF_ENTER": 2.5, - "AEC_STABLE_VIDEO_PDAF_EXIT": 4.0, - "AEC_STABLE_VIDEO_CAF_ENTER": 0.5, - "AEC_STABLE_VIDEO_CAF_EXIT": 1.5, - - "ZAF_CAF_VIDEO_STEP_SIZE_INC_RATIO": 1.6, - - "ZAF_CAF_COMP_LP_ENABLE": true, - "ZAF_CAF_COMP_LP_MAX_RATIO": 0.600, - "ZAF_CAF_COMP_LP_ROI_RATIO": 2.0, - "ZAF_CAF_COMP_EXP_TIME_MIN": 0.015, - "ZAF_CAF_COMP_EXP_TIME_MAX": 0.034, - "ZAF_CAF_COMP_LP_MIN": 0.140, - "ZAF_CAF_COMP_LP_MAX": 0.450, - "ZAF_CAF_COMP_XTALK": 0.0152, - - "ZAF_CAF_SAT_RATIO_REGION_TH": 64, - "ZAF_CAF_SAT_RATIO_EXPAND_RATIO": 3.0, - "ZAF_CAF_POINT_LIGHT_SAT_RATIO_TH": 8, - "ZAF_CAF_POINT_LIGHT_SY_TH": 50, - "ZAF_CAF_DARK_REGION_TH": 4, - - "ZAF_PDAF_PARAM_SIGNAGE_DAC": false, - "ZAF_PDAF_PARAM_USE_CAL_RANGE": true, - "ZAF_PDAF_PARAM_CAL_BIT_SHIFT": 0, - "ZAF_PDAF_PARAM_CONF_SCALE": 1.0, - "ZAF_PDAF_PARAM_CONF_RANGE_EXPAND": true, - - "ZAF_PDAF_PARAM_CONF_HIGH_TH": 140.0, - "ZAF_PDAF_PARAM_CONF_LOW_TH": 70.0, - "ZAF_PDAF_PARAM_CONF_MIN_LP": 115, - "ZAF_PDAF_PARAM_CONF_MAX_LP": 884, - "ZAF_PDAF_PARAM_ROI_SML": 16, - "ZAF_PDAF_PARAM_ROI_MDM": 32, - "ZAF_PDAF_PARAM_ROI_SML_MIN_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_MDM_MIN_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_LRG_MIN_BLOB": 3, - "ZAF_PDAF_PARAM_ROI_SML_MAX_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_MDM_MAX_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_LRG_MAX_BLOB": 6, - "ZAF_PDAF_PARAM_WGHT_DEF_ROI_ATC": 3.0, - "ZAF_PDAF_PARAM_WGHT_DEF_ROI_ATW": 1.0, - "ZAF_PDAF_PARAM_WGHT_TTF_ROI_ATC": 1.0, - "ZAF_PDAF_PARAM_WGHT_TTF_ROI_ATW": 0.5, - - "ZAF_PDAF_PARAM_HIGHGAIN_DISABLE": false, - "ZAF_PDAF_PARAM_HIGHGAIN_ENTER": 12.0, - "ZAF_PDAF_PARAM_HIGHGAIN_EXIT": 9.0, - - "ZAF_PDAF_OSC_DTC_ENABLE": true, - "ZAF_PDAF_OSC_DTC_RATH_TH": 1.0, - "ZAF_PDAF_OSC_DTC_REVERSE_CNT_MIN": 3, - "ZAF_PDAF_OSC_DTC_TIMEOUT": 5000, - - "ZAF_TOF_PARAM_DEFAULT_MODE": 1, - "ZAF_TOF_PARAM_DEFAULT_MODE_TMBUDGET": 30, - "ZAF_TOF_PARAM_MZ_MODE_TMBUDGET": 15, - "ZAF_TOF_PARAM_POLL_DELAY_MS": 5, - "ZAF_TOF_PARAM_DETECT_GLASS": 0, - "ZAF_TOF_PARAM_GLASS_DETECTION_ENTER": 400, - "ZAF_TOF_PARAM_GLASS_DETECTION_EXIT": 500, - "ZAF_TOF_PARAM_FLAT_RATIO_TH": 15, - "ZAF_TOF_PARAM_GLASS_TH": 16, - "ZAF_TOF_PARAM_FILTER_XTALK_RANGING": 1, - "ZAF_TOF_PARAM_XTALK_DISTANCE_TH": 65, - "ZAF_TOF_PARAM_XTALK_SPAD_TH": 200, - "ZAF_TOF_PARAM_DEFAULT_ROI": [0,15,15,0], - "ZAF_TOF_PARAM_MZ_ROI": [0,15,6,9,9,15,15,9,4,10,10,4,0,6,6,0,9,6,15,0], - "ZAF_TOF_ENABLE_REFLECTION_CTRL": 1, - "ZAF_TOF_AUTONOMOUS_POLLING_TIME": 1000, - "ZAF_TOF_SWITCH_DELAY_COUNT": 2, - "ZAF_TOF_STOP_RANGING_ENTER": 70, - "ZAF_TOF_STOP_RANGING_EXIT": 100, - "ZAF_TOF_DEFAULT_RANGE_STEPS": 8, - "ZAF_TOF_VIDEO_RANGE_STEPS": 4, - "ZAF_TOF_RANGE_SENSITIVITY_EANBLE": 1, - "ZAF_TOF_RANGE_SENSITIVITY_DFT_SCALE": 1.0, - "ZAF_TOF_RANGE_SENSITIVITY_VID_SCALE": 0.1, - - "ZAF_FUSION_NSD_ENABLE": true, - "ZAF_FUSION_NSD_ENTER_LUX_IDX": 410.0, - "ZAF_FUSION_NSD_EXIT_LUX_IDX": 420.0, - "ZAF_FUSION_NSD_SAT_RAT_TH": 2, - "ZAF_FUSION_NSD_SY_SAT_RAT_TH": 80, - "ZAF_FUSION_NSD_ZONE_CNT_SY_SCENE_TH": 4, - "ZAF_FUSION_NSD_SY_SCENE_TH": 8, - - "ZAF_TEMP_COMP_LP_ENABLE": true, - "ZAF_TEMP_COMP_LP_PER_DEGREE": -3.7, - "ZAF_TEMP_COMP_LP_NO_CAL_DEFAULT_TEMP": 22.0, - - "ZAF_ALGO_SELECT_ROI_ENABLE": true, - "ZAF_ALGO_SELECT_MOTION_ENABLE": false, - "ZAF_ALGO_SELECT_VRF_FCS_ENABLE": false, - "ZAF_ALGO_SELECT_HIGHGAIN_ENABLE": true, - "ZAF_ALGO_SELECT_CLOSER_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_ROI_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_MOTION_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_VRF_FCS_ENABLE": false, - "ZAF_ALGO_SELECT_VIDEO_HIGHGAIN_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_CLOSER_ENABLE": true, - - "ZAF_ALGO_FOLLOW_ENABLE_CAF": false, - - "ZAF_CAF_SEARCH_TIME_MAX": 66, - "ZAF_CAF_SEARCH_FRAME_MIN": 1, - "ZAF_FOCUS_ASSIST_TIME_MAX": 500, - "ZAF_FOCUS_ASSIST_FRAME_MIN": 7, - "ZAF_STATE_SEARCH_TIME_MAX": 500, - "ZAF_STATE_SEARCH_FRAME_MIN": 7, - "ZAF_NOCONF_SEARCH_TIME_MAX": 500, - "ZAF_NOCONF_SEARCH_FRAME_MIN": 7, - - "ZAF_BF_FILTER_CONFIG_H1_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300], - "ZAF_BF_FILTER_CONFIG_H2_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300], - "ZAF_BF_FILTER_CONFIG_V_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300] -} diff --git a/configs/zaf/zaf_mot_s5k2l7.json b/configs/zaf/zaf_mot_s5k2l7.json deleted file mode 100644 index c28d2c3..0000000 --- a/configs/zaf/zaf_mot_s5k2l7.json +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (C) 2016 Motorola Mobility Inc. - * All Rights Reserved. - * Motorola Mobility Confidential Restricted. - */ -{ - "ZAF_SUPPORTED_CAF": true, - "ZAF_SUPPORTED_PDAF": true, - "ZAF_SUPPORTED_TOF": true, - - "ZAF_ENABLE_CAF": true, - "ZAF_ENABLE_PDAF": true, - "ZAF_ENABLE_TOF": true, - - "ZAF_NEAR_LIMIT": 0, - "ZAF_7CM": 1, - "ZAF_10CM": 115, - "ZAF_14CM": 342, - "ZAF_20CM": 508, - "ZAF_30CM": 635, - "ZAF_40CM": 698, - "ZAF_50CM": 736, - "ZAF_60CM": 760, - "ZAF_120CM": 822, - "ZAF_HYP_F": 864, - "ZAF_1000CM": 884, - "ZAF_INF_LIMIT": 999, - - "ZAF_LENS_REGIONS_NEAR": 0, - "ZAF_LENS_REGIONS_FAR": 12, - - "ZAF_FINE_SCAN_STEP": 25, - - "GYRO_STABLE_CNT_THRESHOLD": 6, - "GYRO_STABLE_DETECT_THRESHOLD": 0.16, - "GYRO_UNSTABLE_CNT_THRESHOLD": 6, - "GYRO_MIN_MOVE_THRESHOLD": 0.20, - "GYRO_SD_STABLE_RATIO": 0.5, - "GYRO_SAMPLE_CNT": 5, - "GYRO_VIDEO_STABLE_CNT_THRESHOLD": 12, - "GYRO_VIDEO_STABLE_DETECT_THRESHOLD": 0.16, - "GYRO_VIDEO_UNSTABLE_CNT_THRESHOLD": 8, - "GYRO_VIDEO_MIN_MOVE_THRESHOLD": 0.20, - "GYRO_VIDEO_SD_STABLE_RATIO": 0.5, - "GYRO_VIDEO_SAMPLE_CNT": 5, - - "AEC_STABLE_PDAF_ENTER": 5.0, - "AEC_STABLE_PDAF_EXIT": 8.0, - "AEC_STABLE_CAF_ENTER": 1.0, - "AEC_STABLE_CAF_EXIT": 3.0, - "AEC_STABLE_VIDEO_PDAF_ENTER": 2.5, - "AEC_STABLE_VIDEO_PDAF_EXIT": 4.0, - "AEC_STABLE_VIDEO_CAF_ENTER": 0.5, - "AEC_STABLE_VIDEO_CAF_EXIT": 1.5, - - "ZAF_CAF_VIDEO_STEP_SIZE_INC_RATIO": 1.6, - - "ZAF_CAF_COMP_LP_ENABLE": true, - "ZAF_CAF_COMP_LP_MAX_RATIO": 0.600, - "ZAF_CAF_COMP_LP_ROI_RATIO": 2.0, - "ZAF_CAF_COMP_EXP_TIME_MIN": 0.015, - "ZAF_CAF_COMP_EXP_TIME_MAX": 0.034, - "ZAF_CAF_COMP_LP_MIN": 0.140, - "ZAF_CAF_COMP_LP_MAX": 0.450, - "ZAF_CAF_COMP_XTALK": 0.0152, - - "ZAF_CAF_SAT_RATIO_REGION_TH": 64, - "ZAF_CAF_SAT_RATIO_EXPAND_RATIO": 3.0, - "ZAF_CAF_POINT_LIGHT_SAT_RATIO_TH": 8, - "ZAF_CAF_POINT_LIGHT_SY_TH": 50, - "ZAF_CAF_DARK_REGION_TH": 4, - - "ZAF_PDAF_PARAM_SIGNAGE_DAC": false, - "ZAF_PDAF_PARAM_USE_CAL_RANGE": true, - "ZAF_PDAF_PARAM_CAL_BIT_SHIFT": 0, - "ZAF_PDAF_PARAM_CONF_SCALE": 1.0, - "ZAF_PDAF_PARAM_CONF_RANGE_EXPAND": true, - - "ZAF_PDAF_PARAM_CONF_HIGH_TH": 160.0, - "ZAF_PDAF_PARAM_CONF_LOW_TH": 130.0, - "ZAF_PDAF_PARAM_CONF_MIN_LP": 115, - "ZAF_PDAF_PARAM_CONF_MAX_LP": 884, - "ZAF_PDAF_PARAM_ROI_SML": 16, - "ZAF_PDAF_PARAM_ROI_MDM": 32, - "ZAF_PDAF_PARAM_ROI_SML_MIN_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_MDM_MIN_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_LRG_MIN_BLOB": 3, - "ZAF_PDAF_PARAM_ROI_SML_MAX_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_MDM_MAX_BLOB": 2, - "ZAF_PDAF_PARAM_ROI_LRG_MAX_BLOB": 6, - "ZAF_PDAF_PARAM_WGHT_DEF_ROI_ATC": 3.0, - "ZAF_PDAF_PARAM_WGHT_DEF_ROI_ATW": 1.0, - "ZAF_PDAF_PARAM_WGHT_TTF_ROI_ATC": 1.0, - "ZAF_PDAF_PARAM_WGHT_TTF_ROI_ATW": 0.5, - - "ZAF_PDAF_PARAM_HIGHGAIN_DISABLE": false, - "ZAF_PDAF_PARAM_HIGHGAIN_ENTER": 20.0, - "ZAF_PDAF_PARAM_HIGHGAIN_EXIT": 16.0, - - "ZAF_PDAF_OSC_DTC_ENABLE": true, - "ZAF_PDAF_OSC_DTC_RATH_TH": 1.0, - "ZAF_PDAF_OSC_DTC_REVERSE_CNT_MIN": 3, - "ZAF_PDAF_OSC_DTC_TIMEOUT": 5000, - - "ZAF_TOF_PARAM_DEFAULT_MODE": 1, - "ZAF_TOF_PARAM_DEFAULT_MODE_TMBUDGET": 30, - "ZAF_TOF_PARAM_MZ_MODE_TMBUDGET": 15, - "ZAF_TOF_PARAM_POLL_DELAY_MS": 5, - "ZAF_TOF_PARAM_DETECT_GLASS": 0, - "ZAF_TOF_PARAM_GLASS_DETECTION_ENTER": 400, - "ZAF_TOF_PARAM_GLASS_DETECTION_EXIT": 500, - "ZAF_TOF_PARAM_FLAT_RATIO_TH": 15, - "ZAF_TOF_PARAM_GLASS_TH": 16, - "ZAF_TOF_PARAM_FILTER_XTALK_RANGING": 1, - "ZAF_TOF_PARAM_XTALK_DISTANCE_TH": 65, - "ZAF_TOF_PARAM_XTALK_SPAD_TH": 200, - "ZAF_TOF_PARAM_DEFAULT_ROI": [0,15,15,0], - "ZAF_TOF_PARAM_MZ_ROI": [0,15,6,9,9,15,15,9,4,10,10,4,0,6,6,0,9,6,15,0], - "ZAF_TOF_ENABLE_REFLECTION_CTRL": 1, - "ZAF_TOF_AUTONOMOUS_POLLING_TIME": 1000, - "ZAF_TOF_SWITCH_DELAY_COUNT": 2, - "ZAF_TOF_STOP_RANGING_ENTER": 70, - "ZAF_TOF_STOP_RANGING_EXIT": 100, - "ZAF_TOF_DEFAULT_RANGE_STEPS": 8, - "ZAF_TOF_VIDEO_RANGE_STEPS": 4, - "ZAF_TOF_RANGE_SENSITIVITY_EANBLE": 1, - "ZAF_TOF_RANGE_SENSITIVITY_DFT_SCALE": 1.0, - "ZAF_TOF_RANGE_SENSITIVITY_VID_SCALE": 0.1, - - "ZAF_FUSION_NSD_ENABLE": true, - "ZAF_FUSION_NSD_ENTER_LUX_IDX": 410.0, - "ZAF_FUSION_NSD_EXIT_LUX_IDX": 420.0, - "ZAF_FUSION_NSD_SAT_RAT_TH": 2, - "ZAF_FUSION_NSD_SY_SAT_RAT_TH": 80, - "ZAF_FUSION_NSD_ZONE_CNT_SY_SCENE_TH": 4, - "ZAF_FUSION_NSD_SY_SCENE_TH": 8, - - "ZAF_TEMP_COMP_LP_ENABLE": true, - "ZAF_TEMP_COMP_LP_PER_DEGREE": -3.7, - "ZAF_TEMP_COMP_LP_NO_CAL_DEFAULT_TEMP": 22.0, - - "ZAF_ALGO_SELECT_ROI_ENABLE": true, - "ZAF_ALGO_SELECT_MOTION_ENABLE": false, - "ZAF_ALGO_SELECT_VRF_FCS_ENABLE": false, - "ZAF_ALGO_SELECT_HIGHGAIN_ENABLE": true, - "ZAF_ALGO_SELECT_CLOSER_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_ROI_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_MOTION_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_VRF_FCS_ENABLE": false, - "ZAF_ALGO_SELECT_VIDEO_HIGHGAIN_ENABLE": true, - "ZAF_ALGO_SELECT_VIDEO_CLOSER_ENABLE": true, - - "ZAF_ALGO_FOLLOW_ENABLE_CAF": false, - - "ZAF_CAF_SEARCH_TIME_MAX": 66, - "ZAF_CAF_SEARCH_FRAME_MIN": 1, - "ZAF_FOCUS_ASSIST_TIME_MAX": 500, - "ZAF_FOCUS_ASSIST_FRAME_MIN": 7, - "ZAF_STATE_SEARCH_TIME_MAX": 500, - "ZAF_STATE_SEARCH_FRAME_MIN": 7, - "ZAF_NOCONF_SEARCH_TIME_MAX": 500, - "ZAF_NOCONF_SEARCH_FRAME_MIN": 7, - - "ZAF_BF_FILTER_CONFIG_H1_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300], - "ZAF_BF_FILTER_CONFIG_H2_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300], - "ZAF_BF_FILTER_CONFIG_V_IIR_COEFF": [0.09234600,0.00000000,-0.09234600,1.71215800,-0.81530800,0.11297600,0.00000000,-0.11297600,1.86969000,-0.89874300] -} diff --git a/device.mk b/device.mk index 2fc6de7..aa5f0b8 100644 --- a/device.mk +++ b/device.mk @@ -383,11 +383,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/vendor/etc/wifi/WCNSS_qcom_cfg.ini -# ZAF -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/zaf/zaf_mot_imx362.json:system/etc/zaf/zaf_mot_imx362.json \ - $(LOCAL_PATH)/configs/zaf/zaf_mot_s5k2l7.json:system/etc/zaf/zaf_mot_s5k2l7.json - PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 PRODUCT_GMS_CLIENTID_BASE := android-motorola