get rid of HAL pixelformats 5551 and 4444
This changes removes the use of 5551 and 4444 pixel formats as its not supported anymore Change-Id: I817510c3c7c0c3d95924c2ffc79e5727a6d6c48f (cherry picked from commit 1fbd4a9662b07d53a3f220c91b3e85ca571a4938)
This commit is contained in:
committed by
Arun Kumar K.R
parent
bc8bee68dc
commit
e4001e736d
@@ -441,8 +441,6 @@ static int stretch_copybit(
|
|||||||
// we don't support plane alpha with RGBA formats
|
// we don't support plane alpha with RGBA formats
|
||||||
case HAL_PIXEL_FORMAT_RGBA_8888:
|
case HAL_PIXEL_FORMAT_RGBA_8888:
|
||||||
case HAL_PIXEL_FORMAT_BGRA_8888:
|
case HAL_PIXEL_FORMAT_BGRA_8888:
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444:
|
|
||||||
ALOGE ("%s : Unsupported Pixel format %d", __FUNCTION__,
|
ALOGE ("%s : Unsupported Pixel format %d", __FUNCTION__,
|
||||||
src->format);
|
src->format);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|||||||
@@ -48,8 +48,6 @@ enum {
|
|||||||
COPYBIT_FORMAT_RGB_888 = HAL_PIXEL_FORMAT_RGB_888,
|
COPYBIT_FORMAT_RGB_888 = HAL_PIXEL_FORMAT_RGB_888,
|
||||||
COPYBIT_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
|
COPYBIT_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
|
||||||
COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
|
COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
|
||||||
COPYBIT_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551,
|
|
||||||
COPYBIT_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444,
|
|
||||||
COPYBIT_FORMAT_YCbCr_422_SP = 0x10,
|
COPYBIT_FORMAT_YCbCr_422_SP = 0x10,
|
||||||
COPYBIT_FORMAT_YCrCb_420_SP = 0x11,
|
COPYBIT_FORMAT_YCrCb_420_SP = 0x11,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -265,8 +265,6 @@ static int get_format(int format) {
|
|||||||
case HAL_PIXEL_FORMAT_RGBA_8888: return C2D_COLOR_FORMAT_8888_ARGB |
|
case HAL_PIXEL_FORMAT_RGBA_8888: return C2D_COLOR_FORMAT_8888_ARGB |
|
||||||
C2D_FORMAT_SWAP_RB;
|
C2D_FORMAT_SWAP_RB;
|
||||||
case HAL_PIXEL_FORMAT_BGRA_8888: return C2D_COLOR_FORMAT_8888_ARGB;
|
case HAL_PIXEL_FORMAT_BGRA_8888: return C2D_COLOR_FORMAT_8888_ARGB;
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551: return C2D_COLOR_FORMAT_5551_RGBA;
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444: return C2D_COLOR_FORMAT_4444_RGBA;
|
|
||||||
case HAL_PIXEL_FORMAT_YCbCr_420_SP: return C2D_COLOR_FORMAT_420_NV12;
|
case HAL_PIXEL_FORMAT_YCbCr_420_SP: return C2D_COLOR_FORMAT_420_NV12;
|
||||||
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:return C2D_COLOR_FORMAT_420_NV12;
|
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:return C2D_COLOR_FORMAT_420_NV12;
|
||||||
case HAL_PIXEL_FORMAT_YCrCb_420_SP: return C2D_COLOR_FORMAT_420_NV21;
|
case HAL_PIXEL_FORMAT_YCrCb_420_SP: return C2D_COLOR_FORMAT_420_NV21;
|
||||||
@@ -400,9 +398,7 @@ static int is_supported_rgb_format(int format)
|
|||||||
case HAL_PIXEL_FORMAT_RGBA_8888:
|
case HAL_PIXEL_FORMAT_RGBA_8888:
|
||||||
case HAL_PIXEL_FORMAT_RGBX_8888:
|
case HAL_PIXEL_FORMAT_RGBX_8888:
|
||||||
case HAL_PIXEL_FORMAT_RGB_565:
|
case HAL_PIXEL_FORMAT_RGB_565:
|
||||||
case HAL_PIXEL_FORMAT_BGRA_8888:
|
case HAL_PIXEL_FORMAT_BGRA_8888: {
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444: {
|
|
||||||
return COPYBIT_SUCCESS;
|
return COPYBIT_SUCCESS;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -121,8 +121,6 @@ int AdrenoMemInfo::getStride(int width, int format)
|
|||||||
bpp = 3;
|
bpp = 3;
|
||||||
break;
|
break;
|
||||||
case HAL_PIXEL_FORMAT_RGB_565:
|
case HAL_PIXEL_FORMAT_RGB_565:
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444:
|
|
||||||
bpp = 2;
|
bpp = 2;
|
||||||
break;
|
break;
|
||||||
default: break;
|
default: break;
|
||||||
@@ -285,8 +283,6 @@ size_t getBufferSizeAndDimensions(int width, int height, int format,
|
|||||||
size = alignedw * alignedh * 3;
|
size = alignedw * alignedh * 3;
|
||||||
break;
|
break;
|
||||||
case HAL_PIXEL_FORMAT_RGB_565:
|
case HAL_PIXEL_FORMAT_RGB_565:
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444:
|
|
||||||
case HAL_PIXEL_FORMAT_RAW_SENSOR:
|
case HAL_PIXEL_FORMAT_RAW_SENSOR:
|
||||||
size = alignedw * alignedh * 2;
|
size = alignedw * alignedh * 2;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -318,8 +318,6 @@ void HwcDebug::dumpLayer(size_t layerIndex, hwc_layer_1_t hwLayers[])
|
|||||||
tempSkBmpConfig = SkBitmap::kARGB_8888_Config;
|
tempSkBmpConfig = SkBitmap::kARGB_8888_Config;
|
||||||
break;
|
break;
|
||||||
case HAL_PIXEL_FORMAT_RGB_565:
|
case HAL_PIXEL_FORMAT_RGB_565:
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444:
|
|
||||||
tempSkBmpConfig = SkBitmap::kRGB_565_Config;
|
tempSkBmpConfig = SkBitmap::kRGB_565_Config;
|
||||||
break;
|
break;
|
||||||
case HAL_PIXEL_FORMAT_RGB_888:
|
case HAL_PIXEL_FORMAT_RGB_888:
|
||||||
@@ -382,12 +380,6 @@ void HwcDebug::getHalPixelFormatStr(int format, char pixFormatStr[])
|
|||||||
case HAL_PIXEL_FORMAT_BGRA_8888:
|
case HAL_PIXEL_FORMAT_BGRA_8888:
|
||||||
strcpy(pixFormatStr, "BGRA_8888");
|
strcpy(pixFormatStr, "BGRA_8888");
|
||||||
break;
|
break;
|
||||||
case HAL_PIXEL_FORMAT_RGBA_5551:
|
|
||||||
strcpy(pixFormatStr, "RGBA_5551");
|
|
||||||
break;
|
|
||||||
case HAL_PIXEL_FORMAT_RGBA_4444:
|
|
||||||
strcpy(pixFormatStr, "RGBA_4444");
|
|
||||||
break;
|
|
||||||
case HAL_PIXEL_FORMAT_YV12:
|
case HAL_PIXEL_FORMAT_YV12:
|
||||||
strcpy(pixFormatStr, "YV12");
|
strcpy(pixFormatStr, "YV12");
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user