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

Commit 06653baa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove AHardwareBuffer_bytesPerPixel" into main

parents 4608403d fe787b7b

libs/nativewindow/AHardwareBuffer.cpp

+7 −30
Original line number Diff line number Diff line
@@ -227,11 +227,14 @@ int AHardwareBuffer_lockPlanes(AHardwareBuffer* buffer, uint64_t usage, 
      }

      return result;

    } else {

      const uint32_t pixelStride = AHardwareBuffer_bytesPerPixel(format);

      int32_t bytesPerPixel;

      int32_t bytesPerStride;

      int result = gBuffer->lockAsync(usage, usage, bounds, &outPlanes->planes[0].data, fence,

                                      &bytesPerPixel, &bytesPerStride);

      outPlanes->planeCount = 1;

      outPlanes->planes[0].pixelStride = pixelStride;

      outPlanes->planes[0].rowStride = gBuffer->getStride() * pixelStride;

      return gBuffer->lockAsync(usage, usage, bounds, &outPlanes->planes[0].data, fence);

      outPlanes->planes[0].pixelStride = bytesPerPixel;

      outPlanes->planes[0].rowStride = bytesPerStride;

      return result;

    }

}
@@ -681,32 +684,6 @@ bool AHardwareBuffer_formatIsYuv(uint32_t format) { 
    }

}



uint32_t AHardwareBuffer_bytesPerPixel(uint32_t format) {

  switch (format) {

      case AHARDWAREBUFFER_FORMAT_R8_UNORM:

          return 1;

      case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:

      case AHARDWAREBUFFER_FORMAT_D16_UNORM:

      case AHARDWAREBUFFER_FORMAT_R16_UINT:

          return 2;

      case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:

      case AHARDWAREBUFFER_FORMAT_D24_UNORM:

          return 3;

      case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:

      case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:

      case AHARDWAREBUFFER_FORMAT_D32_FLOAT:

      case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:

      case AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT:

      case AHARDWAREBUFFER_FORMAT_R16G16_UINT:

          return 4;

      case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:

      case AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM:

          return 8;

      default:

          return 0;

  }

}



uint32_t AHardwareBuffer_convertFromPixelFormat(uint32_t hal_format) {

    return hal_format;

}

libs/nativewindow/include-private/private/android/AHardwareBufferHelpers.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ bool AHardwareBuffer_isValidPixelFormat(uint32_t ahardwarebuffer_format); 
// whether this is a YUV type format

bool AHardwareBuffer_formatIsYuv(uint32_t format);



// number of bytes per pixel or 0 if unknown or multi-planar

uint32_t AHardwareBuffer_bytesPerPixel(uint32_t format);



// convert AHardwareBuffer format to HAL format (note: this is a no-op)

uint32_t AHardwareBuffer_convertFromPixelFormat(uint32_t format);