LineageOS/android_hardware_libhardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Camera2: Make static_camera_characteristics const."

Browse Source 
Needs a third change that's not yet done with review.

This reverts commit c9ec8a656b59912f496880d3a63c0decd490f09d

Change-Id: Ic3e465e1308cbf107a250ec17b73a59a35e52f9f
This commit is contained in:
Eino-Ville Talvala
2012-08-26 14:44:38 -07:00
committed by Android (Google) Code Review
parent d959ec5297
commit dde2a9d4b5
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/hardware/camera_common.h
View File

@@ -135,9 +135,7 @@ struct camera_info {
/** /**
* The camera's fixed characteristics, which include all camera metadata in * The camera's fixed characteristics, which include all camera metadata in
* the android.*.info.* sections. This should be a sorted metadata buffer, * the android.*.info.* sections.
* and may not be modified or freed by the caller. The pointer should remain
* valid for the lifetime of the camera module.
* *
* Version information (based on camera_module_t.common.module_api_version): * Version information (based on camera_module_t.common.module_api_version):
* *
@@ -152,7 +150,7 @@ struct camera_info {
* otherwise. * otherwise.
* *
*/ */
const camera_metadata_t *static_camera_characteristics; camera_metadata_t *static_camera_characteristics;
}; };
typedef struct camera_module { typedef struct camera_module {

22
tests/camera2/camera2.cpp
View File

@@ -236,13 +236,13 @@ class Camera2Test: public testing::Test {
} }
void getResolutionList(int32_t format, void getResolutionList(int32_t format,
const int32_t **list, int32_t **list,
size_t *count) { size_t *count) {
ALOGV("Getting resolutions for format %x", format); ALOGV("Getting resolutions for format %x", format);
status_t res; status_t res;
if (format != CAMERA2_HAL_PIXEL_FORMAT_OPAQUE) { if (format != CAMERA2_HAL_PIXEL_FORMAT_OPAQUE) {
camera_metadata_ro_entry_t availableFormats; camera_metadata_entry_t availableFormats;
res = find_camera_metadata_ro_entry(mStaticInfo, res = find_camera_metadata_entry(mStaticInfo,
ANDROID_SCALER_AVAILABLE_FORMATS, ANDROID_SCALER_AVAILABLE_FORMATS,
&availableFormats); &availableFormats);
ASSERT_EQ(OK, res); ASSERT_EQ(OK, res);
@@ -255,17 +255,17 @@ class Camera2Test: public testing::Test {
<< "No support found for format 0x" << std::hex << format; << "No support found for format 0x" << std::hex << format;
} }
camera_metadata_ro_entry_t availableSizes; camera_metadata_entry_t availableSizes;
if (format == HAL_PIXEL_FORMAT_RAW_SENSOR) { if (format == HAL_PIXEL_FORMAT_RAW_SENSOR) {
res = find_camera_metadata_ro_entry(mStaticInfo, res = find_camera_metadata_entry(mStaticInfo,
ANDROID_SCALER_AVAILABLE_RAW_SIZES, ANDROID_SCALER_AVAILABLE_RAW_SIZES,
&availableSizes); &availableSizes);
} else if (format == HAL_PIXEL_FORMAT_BLOB) { } else if (format == HAL_PIXEL_FORMAT_BLOB) {
res = find_camera_metadata_ro_entry(mStaticInfo, res = find_camera_metadata_entry(mStaticInfo,
ANDROID_SCALER_AVAILABLE_JPEG_SIZES, ANDROID_SCALER_AVAILABLE_JPEG_SIZES,
&availableSizes); &availableSizes);
} else { } else {
res = find_camera_metadata_ro_entry(mStaticInfo, res = find_camera_metadata_entry(mStaticInfo,
ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES, ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES,
&availableSizes); &availableSizes);
} }
@@ -293,7 +293,7 @@ class Camera2Test: public testing::Test {
} }
camera2_device *mDevice; camera2_device *mDevice;
const camera_metadata_t *mStaticInfo; camera_metadata_t *mStaticInfo;
MetadataQueue mRequests; MetadataQueue mRequests;
MetadataQueue mFrames; MetadataQueue mFrames;
@@ -342,7 +342,7 @@ TEST_F(Camera2Test, Capture1Raw) {
sp<FrameWaiter> rawWaiter = new FrameWaiter(); sp<FrameWaiter> rawWaiter = new FrameWaiter();
rawConsumer->setFrameAvailableListener(rawWaiter); rawConsumer->setFrameAvailableListener(rawWaiter);
const int32_t *rawResolutions; int32_t *rawResolutions;
size_t rawResolutionsCount; size_t rawResolutionsCount;
int format = HAL_PIXEL_FORMAT_RAW_SENSOR; int format = HAL_PIXEL_FORMAT_RAW_SENSOR;
@@ -456,7 +456,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
sp<FrameWaiter> rawWaiter = new FrameWaiter(); sp<FrameWaiter> rawWaiter = new FrameWaiter();
rawConsumer->setFrameAvailableListener(rawWaiter); rawConsumer->setFrameAvailableListener(rawWaiter);
const int32_t *rawResolutions; int32_t *rawResolutions;
size_t rawResolutionsCount; size_t rawResolutionsCount;
int format = HAL_PIXEL_FORMAT_RAW_SENSOR; int format = HAL_PIXEL_FORMAT_RAW_SENSOR;
@@ -618,7 +618,7 @@ TEST_F(Camera2Test, Capture1Jpeg) {
sp<FrameWaiter> jpegWaiter = new FrameWaiter(); sp<FrameWaiter> jpegWaiter = new FrameWaiter();
jpegConsumer->setFrameAvailableListener(jpegWaiter); jpegConsumer->setFrameAvailableListener(jpegWaiter);
const int32_t *jpegResolutions; int32_t *jpegResolutions;
size_t jpegResolutionsCount; size_t jpegResolutionsCount;
int format = HAL_PIXEL_FORMAT_BLOB; int format = HAL_PIXEL_FORMAT_BLOB;