Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c649fb1c authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 

Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp

* commit '38eea8bf990540360b45b963195a7766c30b55d2':
  Remove the YV16 format for simplicity's sake.
parents 1ffda8d7 91c2a664

libs/surfaceflinger/TextureManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ bool TextureManager::isSupportedYuvFormat(int format) 
{

    switch (format) {

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV16:

        return true;

    }

    return false;
@@ -118,7 +117,6 @@ bool TextureManager::isYuvFormat(int format) 
    switch (format) {

    // supported YUV formats

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV16:

    // Legacy/deprecated YUV formats

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP:

libs/ui/PixelFormat.cpp

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info) 
    switch (format) {

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCbCr_422_I:

    case HAL_PIXEL_FORMAT_YV16:

        info->bitsPerPixel = 16;

        goto done;

    case HAL_PIXEL_FORMAT_YCrCb_420_SP: