diff options
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index d85743df..b8fb1d92 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013, The Linux Foundataion. All rights reserved. +/* Copyright (c) 2012-2015, The Linux Foundataion. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -4341,6 +4341,7 @@ int QCamera3HardwareInterface::initStaticMetadata(int cameraId) switch (scalar_formats[j]) { case ANDROID_SCALER_AVAILABLE_FORMATS_RAW16: case ANDROID_SCALER_AVAILABLE_FORMATS_RAW_OPAQUE: + case HAL_PIXEL_FORMAT_RAW10: for (int i = 0; i < gCamCapability[cameraId]->supported_raw_dim_cnt; i++) { available_min_durations[idx] = scalar_formats[j]; @@ -4368,7 +4369,7 @@ int QCamera3HardwareInterface::initStaticMetadata(int cameraId) break; } } - staticInfo.update(ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS, + staticInfo.update(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, &available_min_durations[0], idx); int32_t max_jpeg_size = calcMaxJpegSize(cameraId); @@ -4660,23 +4661,6 @@ int QCamera3HardwareInterface::initStaticMetadata(int cameraId) available_hot_pixel_map_modes, 1); - int32_t avail_min_frame_durations_size = gCamCapability[cameraId]->picture_sizes_tbl_cnt * - sizeof(scalar_formats)/sizeof(int32_t) * 4; - int64_t avail_min_frame_durations[avail_min_frame_durations_size]; - int pos = 0; - for (int j = 0; j < scalar_formats_count; j++) { - for (int i = 0; i < gCamCapability[cameraId]->picture_sizes_tbl_cnt; i++) { - avail_min_frame_durations[pos] = scalar_formats[j]; - avail_min_frame_durations[pos+1] = gCamCapability[cameraId]->picture_sizes_tbl[i].width; - avail_min_frame_durations[pos+2] = gCamCapability[cameraId]->picture_sizes_tbl[i].height; - avail_min_frame_durations[pos+3] = gCamCapability[cameraId]->picture_min_duration[i]; - pos+=4; - } - } - staticInfo.update(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, - avail_min_frame_durations, - avail_min_frame_durations_size); - uint8_t fwkReferenceIlluminant = lookupFwkName(REFERENCE_ILLUMINANT_MAP, sizeof(REFERENCE_ILLUMINANT_MAP) / sizeof(REFERENCE_ILLUMINANT_MAP[0]), gCamCapability[cameraId]->reference_illuminant1); |