author | guosong.zhou <guosong.zhou@amlogic.com> | 2014-11-11 12:25:17 (GMT) |
---|---|---|
committer | guosong.zhou <guosong.zhou@amlogic.com> | 2014-11-11 12:25:17 (GMT) |
commit | cd5e1f7d01f07e103ceba38f10e653a37f7f3883 (patch) | |
tree | ca0be6fc044a083b75a6d058978c9b2f71797828 | |
parent | aa2115781f9addc91be627dbfb2ac6958048e2ac (diff) | |
download | camera-cd5e1f7d01f07e103ceba38f10e653a37f7f3883.zip camera-cd5e1f7d01f07e103ceba38f10e653a37f7f3883.tar.gz camera-cd5e1f7d01f07e103ceba38f10e653a37f7f3883.tar.bz2 |
change supported hardware level to limited for cts
-rwxr-xr-x | v3/EmulatedFakeCamera3.cpp | 14 | ||||
-rwxr-xr-x | v3/EmulatedFakeCamera3Info.cpp | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp index 0b0718b..664030e 100755 --- a/v3/EmulatedFakeCamera3.cpp +++ b/v3/EmulatedFakeCamera3.cpp @@ -1480,6 +1480,8 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { } info.update(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/ sizeof(float)); + static const uint8_t lensCalibration = ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED; + info.update(ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION,&lensCalibration,1); // android.sensor @@ -1520,6 +1522,8 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { info.update(ANDROID_SENSOR_BLACK_LEVEL_PATTERN, blackLevelPattern, sizeof(blackLevelPattern)/sizeof(int32_t)); + static const uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN; + info.update(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE, ×tampSource, 1); static const int32_t orientation = 0; // unrotated (0 degrees) info.update(ANDROID_SENSOR_ORIENTATION, &orientation, 1); @@ -1535,6 +1539,10 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { static const int64_t flashChargeDuration = 0; info.update(ANDROID_FLASH_INFO_CHARGE_DURATION, &flashChargeDuration, 1); + /** android.noise */ + static const uint8_t availableNBModes = ANDROID_NOISE_REDUCTION_MODE_OFF; + info.update(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, &availableNBModes, 1); + // android.tonemap static const int32_t tonemapCurvePoints = 128; @@ -1783,7 +1791,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { availableVstabModes, sizeof(availableVstabModes)); // android.info - const uint8_t supportedHardwareLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY; + const uint8_t supportedHardwareLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED; //mFullMode ? ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL : // ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED; info.update(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, @@ -1805,6 +1813,10 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { (uint8_t *)cap, sizeof(cap)/sizeof(cap[0])); + int32_t partialResultCount = 1; + info.update(ANDROID_REQUEST_PARTIAL_RESULT_COUNT,&partialResultCount,1); + int32_t maxNumOutputStreams[3] = {0,2,1}; + info.update(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,maxNumOutputStreams,3); uint8_t aberrationMode[] = {ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF}; info.update(ANDROID_COLOR_CORRECTION_ABERRATION_MODE, aberrationMode, 1); diff --git a/v3/EmulatedFakeCamera3Info.cpp b/v3/EmulatedFakeCamera3Info.cpp index 9b13eaf..1808711 100755 --- a/v3/EmulatedFakeCamera3Info.cpp +++ b/v3/EmulatedFakeCamera3Info.cpp @@ -55,6 +55,7 @@ const struct EmulatedFakeCamera3::KeyInfo_s EmulatedFakeCamera3::sKeyInfo[] = { {ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE, 1,}, {ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, 0,}, {ANDROID_REQUEST_AVAILABLE_CAPABILITIES, 0,}, + {ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS, 0,}, //{ANDROID_REQUEST_MAX_NUM_OUTPUT_PROC, 0,}, //{ANDROID_REQUEST_MAX_NUM_OUTPUT_PROC_STALLING, 0,}, //{ANDROID_REQUEST_MAX_NUM_OUTPUT_RAW, 0,}, |