diff options
| author | Shobhit Singh <shobsi@codeaurora.org> | 2018-07-09 15:39:30 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-11-02 15:23:13 +0100 |
| commit | 3f0d02d2a722c2f0c59838a1ddab53992250e6dd (patch) | |
| tree | dbcb52bbeeded422d0c535cd3da96bdace989698 /camera | |
| parent | 4e5917ff7c04568bd648939c36236678136047c7 (diff) | |
msm8996-common: QCamera2: HAL: Fix CTS CameraDeviceTest issues
Setting hotpixelMode, shadingmode values HIGH_QUALITY
for still_capture template and FAST for rest templates.
shadingmap_mode default value as OFF, for sensor type
RAW & Still_capture template setting as ON.
CRs-Fixed: 2263385
Change-Id: Ia36c373bc69424eaddd0f39a735ba84ad72829c2
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 9fb6a58..53abde9 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -5455,9 +5455,6 @@ QCamera3HardwareInterface::translateFromHalMetadata( camMetadata.update(ANDROID_CONTROL_MODE, &fwk_mode, 1); } - /* Constant metadata values to be update*/ - uint8_t hotPixelModeFast = ANDROID_HOT_PIXEL_MODE_FAST; - camMetadata.update(ANDROID_HOT_PIXEL_MODE, &hotPixelModeFast, 1); uint8_t hotPixelMapMode = ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE_OFF; camMetadata.update(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE, &hotPixelMapMode, 1); @@ -7922,6 +7919,9 @@ camera_metadata_t* QCamera3HardwareInterface::translateCapabilityToMetadata(int uint8_t edge_mode; uint8_t noise_red_mode; uint8_t tonemap_mode; + uint8_t hotpixelMode = ANDROID_HOT_PIXEL_MODE_FAST; + uint8_t shadingmode = ANDROID_SHADING_MODE_FAST; + uint8_t shadingmap_mode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF; bool highQualityModeEntryAvailable = FALSE; bool fastModeEntryAvailable = FALSE; vsMode = ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF; @@ -7943,6 +7943,11 @@ camera_metadata_t* QCamera3HardwareInterface::translateCapabilityToMetadata(int edge_mode = ANDROID_EDGE_MODE_HIGH_QUALITY; noise_red_mode = ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY; tonemap_mode = ANDROID_TONEMAP_MODE_HIGH_QUALITY; + hotpixelMode = ANDROID_HOT_PIXEL_MODE_HIGH_QUALITY; + shadingmode = ANDROID_SHADING_MODE_HIGH_QUALITY; + if (CAM_SENSOR_RAW == gCamCapability[mCameraId]->sensor_type.sens_type) { + shadingmap_mode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON; + } cacMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF; // Order of priority for default CAC is HIGH Quality -> FAST -> OFF for (size_t i = 0; i < gCamCapability[mCameraId]->aberration_modes_count; i++) { @@ -8083,8 +8088,8 @@ camera_metadata_t* QCamera3HardwareInterface::translateCapabilityToMetadata(int static const uint8_t demosaicMode = ANDROID_DEMOSAIC_MODE_FAST; settings.update(ANDROID_DEMOSAIC_MODE, &demosaicMode, 1); - static const uint8_t hotpixelMode = ANDROID_HOT_PIXEL_MODE_FAST; settings.update(ANDROID_HOT_PIXEL_MODE, &hotpixelMode, 1); + settings.update(ANDROID_SHADING_MODE, &shadingmode, 1); static const int32_t testpatternMode = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF; settings.update(ANDROID_SENSOR_TEST_PATTERN_MODE, &testpatternMode, 1); @@ -8204,11 +8209,6 @@ camera_metadata_t* QCamera3HardwareInterface::translateCapabilityToMetadata(int uint8_t blacklevel_lock = ANDROID_BLACK_LEVEL_LOCK_OFF; settings.update(ANDROID_BLACK_LEVEL_LOCK, &blacklevel_lock, 1); - /* lens shading map mode */ - uint8_t shadingmap_mode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF; - if (CAM_SENSOR_RAW == gCamCapability[mCameraId]->sensor_type.sens_type) { - shadingmap_mode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON; - } settings.update(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &shadingmap_mode, 1); //special defaults for manual template |