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

Replace/rename old HAL graphics formats

Browse Source 
- Replace RAW_SENSOR with RAW16
 - Remove sRGB formats

Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1
This commit is contained in:
Eino-Ville Talvala
2015-03-06 13:19:36 -08:00
parent 8558510d59
commit e69efbbabf
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/camera/ExampleCamera.cpp
View File

@@ -92,7 +92,7 @@ camera_metadata_t *ExampleCamera::initStaticInfo()
/* android.scaler */ /* android.scaler */
int32_t android_scaler_available_formats[] = { int32_t android_scaler_available_formats[] = {
HAL_PIXEL_FORMAT_RAW_SENSOR, HAL_PIXEL_FORMAT_RAW16,
HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_BLOB,
HAL_PIXEL_FORMAT_RGBA_8888, HAL_PIXEL_FORMAT_RGBA_8888,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,

10
modules/camera/Stream.cpp
View File

@@ -117,10 +117,6 @@ const char* Stream::formatToString(int format)
return "RGB 888"; return "RGB 888";
case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_RGB_565:
return "RGB 565"; return "RGB 565";
case HAL_PIXEL_FORMAT_sRGB_A_8888:
return "sRGB A 8888";
case HAL_PIXEL_FORMAT_sRGB_X_8888:
return "sRGB B 8888";
case HAL_PIXEL_FORMAT_Y8: case HAL_PIXEL_FORMAT_Y8:
return "Y8"; return "Y8";
case HAL_PIXEL_FORMAT_Y16: case HAL_PIXEL_FORMAT_Y16:
@@ -133,8 +129,10 @@ const char* Stream::formatToString(int format)
return "NV21"; return "NV21";
case HAL_PIXEL_FORMAT_YCbCr_422_I: case HAL_PIXEL_FORMAT_YCbCr_422_I:
return "YUY2"; return "YUY2";
case HAL_PIXEL_FORMAT_RAW_SENSOR: case HAL_PIXEL_FORMAT_RAW10:
return "RAW SENSOR"; return "RAW10";
case HAL_PIXEL_FORMAT_RAW16:
return "RAW16";
case HAL_PIXEL_FORMAT_BLOB: case HAL_PIXEL_FORMAT_BLOB:
return "BLOB"; return "BLOB";
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:

2
modules/gralloc/gralloc.cpp
View File

@@ -217,7 +217,7 @@ static int gralloc_alloc(alloc_device_t* dev,
bpp = 3; bpp = 3;
break; break;
case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_RGB_565:
case HAL_PIXEL_FORMAT_RAW_SENSOR: case HAL_PIXEL_FORMAT_RAW16:
bpp = 2; bpp = 2;
break; break;
default: default:

10
modules/usbcamera/Stream.cpp
View File

@@ -98,10 +98,6 @@ const char* Stream::formatToString(int format) {
return "RGB 888"; return "RGB 888";
case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_RGB_565:
return "RGB 565"; return "RGB 565";
case HAL_PIXEL_FORMAT_sRGB_A_8888:
return "sRGB A 8888";
case HAL_PIXEL_FORMAT_sRGB_X_8888:
return "sRGB B 8888";
case HAL_PIXEL_FORMAT_Y8: case HAL_PIXEL_FORMAT_Y8:
return "Y8"; return "Y8";
case HAL_PIXEL_FORMAT_Y16: case HAL_PIXEL_FORMAT_Y16:
@@ -114,8 +110,10 @@ const char* Stream::formatToString(int format) {
return "NV21"; return "NV21";
case HAL_PIXEL_FORMAT_YCbCr_422_I: case HAL_PIXEL_FORMAT_YCbCr_422_I:
return "YUY2"; return "YUY2";
case HAL_PIXEL_FORMAT_RAW_SENSOR: case HAL_PIXEL_FORMAT_RAW10:
return "RAW SENSOR"; return "RAW10";
case HAL_PIXEL_FORMAT_RAW16:
return "RAW16";
case HAL_PIXEL_FORMAT_BLOB: case HAL_PIXEL_FORMAT_BLOB:
return "BLOB"; return "BLOB";
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:

2
modules/usbcamera/UsbCamera.cpp
View File

@@ -94,7 +94,7 @@ int UsbCamera::initStaticInfo() {
/* android.scaler */ /* android.scaler */
int32_t android_scaler_available_formats[] = { int32_t android_scaler_available_formats[] = {
HAL_PIXEL_FORMAT_RAW_SENSOR, HAL_PIXEL_FORMAT_RAW16,
HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_BLOB,
HAL_PIXEL_FORMAT_RGBA_8888, HAL_PIXEL_FORMAT_RGBA_8888,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,

2
tests/camera2/CameraMetadataTests.cpp
View File

@@ -169,7 +169,7 @@ TEST_F(CameraMetadataTest, SaneResolutions) {
if (rawResolutionsCount > 0) { if (rawResolutionsCount > 0) {
EXPECT_TRUE( EXPECT_TRUE(
HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS,
HAL_PIXEL_FORMAT_RAW_SENSOR)); HAL_PIXEL_FORMAT_RAW16));
} }
// Required processed sizes. // Required processed sizes.

6
tests/camera2/CameraStreamTests.cpp
View File

@@ -166,15 +166,15 @@ static CameraStreamParams TestParameters[] = {
/*mHeapCount*/ 3 /*mHeapCount*/ 3
}, },
{ {
/*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, /*mFormat*/ HAL_PIXEL_FORMAT_RAW16,
/*mHeapCount*/ 1 /*mHeapCount*/ 1
}, },
{ {
/*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, /*mFormat*/ HAL_PIXEL_FORMAT_RAW16,
/*mHeapCount*/ 2 /*mHeapCount*/ 2
}, },
{ {
/*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, /*mFormat*/ HAL_PIXEL_FORMAT_RAW16,
/*mHeapCount*/ 3 /*mHeapCount*/ 3
}, },
}; };

10
tests/camera2/camera2.cpp
View File

@@ -305,7 +305,7 @@ class Camera2Test: public testing::Test {
} }
camera_metadata_ro_entry_t availableSizes; camera_metadata_ro_entry_t availableSizes;
if (format == HAL_PIXEL_FORMAT_RAW_SENSOR) { if (format == HAL_PIXEL_FORMAT_RAW16) {
res = find_camera_metadata_ro_entry(mStaticInfo, res = find_camera_metadata_ro_entry(mStaticInfo,
ANDROID_SCALER_AVAILABLE_RAW_SIZES, ANDROID_SCALER_AVAILABLE_RAW_SIZES,
&availableSizes); &availableSizes);
@@ -445,7 +445,7 @@ TEST_F(Camera2Test, Capture1Raw) {
const int32_t *rawResolutions; const int32_t *rawResolutions;
size_t rawResolutionsCount; size_t rawResolutionsCount;
int format = HAL_PIXEL_FORMAT_RAW_SENSOR; int format = HAL_PIXEL_FORMAT_RAW16;
getResolutionList(format, getResolutionList(format,
&rawResolutions, &rawResolutionsCount); &rawResolutions, &rawResolutionsCount);
@@ -457,7 +457,7 @@ TEST_F(Camera2Test, Capture1Raw) {
<< test_info->test_case_name() << "." << test_info->test_case_name() << "."
<< test_info->name() << test_info->name()
<< " because the optional format was not available: " << " because the optional format was not available: "
<< "RAW_SENSOR" << std::endl; << "RAW16" << std::endl;
return; return;
} }
@@ -581,7 +581,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
const int32_t *rawResolutions; const int32_t *rawResolutions;
size_t rawResolutionsCount; size_t rawResolutionsCount;
int format = HAL_PIXEL_FORMAT_RAW_SENSOR; int format = HAL_PIXEL_FORMAT_RAW16;
getResolutionList(format, getResolutionList(format,
&rawResolutions, &rawResolutionsCount); &rawResolutions, &rawResolutionsCount);
@@ -593,7 +593,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
<< test_info->test_case_name() << "." << test_info->test_case_name() << "."
<< test_info->name() << test_info->name()
<< " because the optional format was not available: " << " because the optional format was not available: "
<< "RAW_SENSOR" << std::endl; << "RAW16" << std::endl;
return; return;
} }