ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of PixelFormatInfo and simplify things 

Change-Id: I025a362cc12d5b9b794fac14be500e25aab65396
This commit is contained in:
Mathias Agopian 2013-07-25 19:24:31 -07:00
parent 1fe854f678
commit 5773d3f5b2
5 changed files with 48 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/DisplayInfo.h
View File

@ -34,8 +34,6 @@ struct DisplayInfo {
uint8_t orientation; uint8_t orientation;
bool secure; bool secure;
uint8_t reserved[2]; uint8_t reserved[2];
// TODO: this needs to go away (currently needed only by webkit)
PixelFormatInfo pixelFormatInfo;
}; };
/* Display orientations as defined in Surface.java and ISurfaceComposer.h. */ /* Display orientations as defined in Surface.java and ISurfaceComposer.h. */

56
include/ui/PixelFormat.h
View File

@ -67,60 +67,8 @@ enum {
typedef int32_t PixelFormat; typedef int32_t PixelFormat;
struct PixelFormatInfo { ssize_t bytesPerPixel(PixelFormat format);
enum { ssize_t bitsPerPixel(PixelFormat format);
INDEX_ALPHA = 0,
INDEX_RED = 1,
INDEX_GREEN = 2,
INDEX_BLUE = 3
};
enum { // components
ALPHA = 1,
RGB = 2,
RGBA = 3,
L = 4,
LA = 5,
OTHER = 0xFF
};
struct szinfo {
uint8_t h;
uint8_t l;
};
inline PixelFormatInfo() : version(sizeof(PixelFormatInfo)) { }
size_t getScanlineSize(unsigned int width) const;
size_t getSize(size_t ci) const {
return (ci <= 3) ? (cinfo[ci].h - cinfo[ci].l) : 0;
}
size_t version;
PixelFormat format;
size_t bytesPerPixel;
size_t bitsPerPixel;
union {
szinfo cinfo[4];
struct {
uint8_t h_alpha;
uint8_t l_alpha;
uint8_t h_red;
uint8_t l_red;
uint8_t h_green;
uint8_t l_green;
uint8_t h_blue;
uint8_t l_blue;
};
};
uint8_t components;
uint8_t reserved0[3];
uint32_t reserved1;
};
// Consider caching the results of these functions are they're not
// guaranteed to be fast.
ssize_t bytesPerPixel(PixelFormat format);
ssize_t bitsPerPixel(PixelFormat format);
status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info);
}; // namespace android }; // namespace android

149
libs/ui/PixelFormat.cpp
View File

@ -21,123 +21,46 @@
namespace android { namespace android {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static const int COMPONENT_YUV = 0xFF; ssize_t bytesPerPixel(PixelFormat format) {
struct Info {
size_t size;
size_t bitsPerPixel;
struct {
uint8_t ah;
uint8_t al;
uint8_t rh;
uint8_t rl;
uint8_t gh;
uint8_t gl;
uint8_t bh;
uint8_t bl;
};
uint8_t components;
};
static Info const sPixelFormatInfos[] = {
{ 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
{ 4, 32, {32,24, 8, 0, 16, 8, 24,16 }, PixelFormatInfo::RGBA },
{ 4, 24, { 0, 0, 8, 0, 16, 8, 24,16 }, PixelFormatInfo::RGB },
{ 3, 24, { 0, 0, 8, 0, 16, 8, 24,16 }, PixelFormatInfo::RGB },
{ 2, 16, { 0, 0, 16,11, 11, 5, 5, 0 }, PixelFormatInfo::RGB },
{ 4, 32, {32,24, 24,16, 16, 8, 8, 0 }, PixelFormatInfo::RGBA },
{ 2, 16, { 1, 0, 16,11, 11, 6, 6, 1 }, PixelFormatInfo::RGBA },
{ 2, 16, { 4, 0, 16,12, 12, 8, 8, 4 }, PixelFormatInfo::RGBA },
{ 1, 8, { 8, 0, 0, 0, 0, 0, 0, 0 }, PixelFormatInfo::ALPHA},
{ 1, 8, { 0, 0, 8, 0, 8, 0, 8, 0 }, PixelFormatInfo::L },
{ 2, 16, {16, 8, 8, 0, 8, 0, 8, 0 }, PixelFormatInfo::LA },
{ 1, 8, { 0, 0, 8, 5, 5, 2, 2, 0 }, PixelFormatInfo::RGB },
};
static const Info* gGetPixelFormatTable(size_t* numEntries) {
if (numEntries) {
*numEntries = sizeof(sPixelFormatInfos)/sizeof(Info);
}
return sPixelFormatInfos;
}
// ----------------------------------------------------------------------------
size_t PixelFormatInfo::getScanlineSize(unsigned int width) const
{
size_t size;
if (components == COMPONENT_YUV) {
// YCbCr formats are different.
size = (width * bitsPerPixel)>>3;
} else {
size = width * bytesPerPixel;
}
return size;
}
ssize_t bytesPerPixel(PixelFormat format)
{
PixelFormatInfo info;
status_t err = getPixelFormatInfo(format, &info);
return (err < 0) ? err : info.bytesPerPixel;
}
ssize_t bitsPerPixel(PixelFormat format)
{
PixelFormatInfo info;
status_t err = getPixelFormatInfo(format, &info);
return (err < 0) ? err : info.bitsPerPixel;
}
status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info)
{
if (format <= 0)
return BAD_VALUE;
if (info->version != sizeof(PixelFormatInfo))
return INVALID_OPERATION;
// YUV format from the HAL are handled here
switch (format) { switch (format) {
case HAL_PIXEL_FORMAT_YCbCr_422_SP: case HAL_PIXEL_FORMAT_RGBA_8888:
case HAL_PIXEL_FORMAT_YCbCr_422_I: case HAL_PIXEL_FORMAT_RGBX_8888:
info->bitsPerPixel = 16; case HAL_PIXEL_FORMAT_BGRA_8888:
goto done; return 4;
case HAL_PIXEL_FORMAT_YCrCb_420_SP: case HAL_PIXEL_FORMAT_RGB_888:
case HAL_PIXEL_FORMAT_YV12: return 3;
info->bitsPerPixel = 12; case HAL_PIXEL_FORMAT_RGB_565:
done: case HAL_PIXEL_FORMAT_RGBA_5551:
info->format = format; case HAL_PIXEL_FORMAT_RGBA_4444:
info->components = COMPONENT_YUV; return 2;
info->bytesPerPixel = 1; case HAL_PIXEL_FORMAT_YCbCr_422_SP:
info->h_alpha = 0; case HAL_PIXEL_FORMAT_YCbCr_422_I:
info->l_alpha = 0; case HAL_PIXEL_FORMAT_YCrCb_420_SP:
info->h_red = info->h_green = info->h_blue = 8; case HAL_PIXEL_FORMAT_YV12:
info->l_red = info->l_green = info->l_blue = 0; return 1;
return NO_ERROR;
} }
return BAD_VALUE;
}
size_t numEntries; ssize_t bitsPerPixel(PixelFormat format) {
const Info *i = gGetPixelFormatTable(&numEntries) + format; switch (format) {
bool valid = uint32_t(format) < numEntries; case HAL_PIXEL_FORMAT_RGBA_8888:
if (!valid) { case HAL_PIXEL_FORMAT_RGBX_8888:
return BAD_INDEX; case HAL_PIXEL_FORMAT_BGRA_8888:
return 32;
case HAL_PIXEL_FORMAT_RGB_888:
return 24;
case HAL_PIXEL_FORMAT_RGB_565:
case HAL_PIXEL_FORMAT_RGBA_5551:
case HAL_PIXEL_FORMAT_RGBA_4444:
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
case HAL_PIXEL_FORMAT_YCbCr_422_I:
return 16;
case HAL_PIXEL_FORMAT_YCrCb_420_SP:
case HAL_PIXEL_FORMAT_YV12:
return 12;
} }
return BAD_VALUE;
info->format = format;
info->bytesPerPixel = i->size;
info->bitsPerPixel = i->bitsPerPixel;
info->h_alpha = i->ah;
info->l_alpha = i->al;
info->h_red = i->rh;
info->l_red = i->rl;
info->h_green = i->gh;
info->l_green = i->gl;
info->h_blue = i->bh;
info->l_blue = i->bl;
info->components = i->components;
return NO_ERROR;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

24
services/surfaceflinger/Layer.cpp
View File

@ -176,14 +176,6 @@ const String8& Layer::getName() const {
status_t Layer::setBuffers( uint32_t w, uint32_t h, status_t Layer::setBuffers( uint32_t w, uint32_t h,
PixelFormat format, uint32_t flags) PixelFormat format, uint32_t flags)
{ {
// this surfaces pixel format
PixelFormatInfo info;
status_t err = getPixelFormatInfo(format, &info);
if (err) {
ALOGE("unsupported pixelformat %d", format);
return err;
}
uint32_t const maxSurfaceDims = min( uint32_t const maxSurfaceDims = min(
mFlinger->getMaxTextureSize(), mFlinger->getMaxViewportDims()); mFlinger->getMaxTextureSize(), mFlinger->getMaxViewportDims());
@ -583,15 +575,19 @@ bool Layer::getFiltering() const {
// hardware.h, instead of using hard-coded values here. // hardware.h, instead of using hard-coded values here.
#define HARDWARE_IS_DEVICE_FORMAT(f) ((f) >= 0x100 && (f) <= 0x1FF) #define HARDWARE_IS_DEVICE_FORMAT(f) ((f) >= 0x100 && (f) <= 0x1FF)
bool Layer::getOpacityForFormat(uint32_t format) bool Layer::getOpacityForFormat(uint32_t format) {
{
if (HARDWARE_IS_DEVICE_FORMAT(format)) { if (HARDWARE_IS_DEVICE_FORMAT(format)) {
return true; return true;
} }
PixelFormatInfo info; switch (format) {
status_t err = getPixelFormatInfo(PixelFormat(format), &info); case HAL_PIXEL_FORMAT_RGBA_8888:
// in case of error (unknown format), we assume no blending case HAL_PIXEL_FORMAT_BGRA_8888:
return (err || info.h_alpha <= info.l_alpha); case HAL_PIXEL_FORMAT_RGBA_5551:
case HAL_PIXEL_FORMAT_RGBA_4444:
return true;
}
// in all other case, we have no blending (also for unknown formats)
return false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

1
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -566,7 +566,6 @@ status_t SurfaceFlinger::getDisplayInfo(const sp<IBinder>& display, DisplayInfo*
// TODO: this needs to go away (currently needed only by webkit) // TODO: this needs to go away (currently needed only by webkit)
sp<const DisplayDevice> hw(getDefaultDisplayDevice()); sp<const DisplayDevice> hw(getDefaultDisplayDevice());
info->orientation = hw->getOrientation(); info->orientation = hw->getOrientation();
getPixelFormatInfo(hw->getFormat(), &info->pixelFormatInfo);
} else { } else {
// TODO: where should this value come from? // TODO: where should this value come from?
static const int TV_DENSITY = 213; static const int TV_DENSITY = 213;