Fixes YV12 image creation crash am: d007afcf24 am: 04911f9ef2 am: 72529ecf88
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mesa3d/+/17939448
Change-Id: I3dfd1ca4788be61ae2a5c6a8dcfb015b645567b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 782d66a..c8e0e7b 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -203,24 +203,56 @@
int ret;
unsigned error;
- if (!dri2_dpy->gralloc->lock_ycbcr) {
- _eglLog(_EGL_WARNING, "Gralloc does not support lock_ycbcr");
- return NULL;
- }
-
memset(&ycbcr, 0, sizeof(ycbcr));
- ret = dri2_dpy->gralloc->lock_ycbcr(dri2_dpy->gralloc, buf->handle,
- 0, 0, 0, 0, 0, &ycbcr);
- if (ret) {
- /* HACK: See droid_create_image_from_prime_fds() and
- * https://issuetracker.google.com/32077885.*/
- if (buf->format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED)
- return NULL;
+ if (dri2_dpy->gralloc->lock_ycbcr) {
+ ret = dri2_dpy->gralloc->lock_ycbcr(dri2_dpy->gralloc, buf->handle,
+ 0, 0, 0, 0, 0, &ycbcr);
+ if (ret) {
+ /* HACK: See droid_create_image_from_prime_fds() and
+ * https://issuetracker.google.com/32077885.*/
+ if (buf->format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED)
+ return NULL;
- _eglLog(_EGL_WARNING, "gralloc->lock_ycbcr failed: %d", ret);
- return NULL;
+ _eglLog(_EGL_WARNING, "gralloc->lock_ycbcr failed: %d", ret);
+ return NULL;
+ }
+ dri2_dpy->gralloc->unlock(dri2_dpy->gralloc, buf->handle);
+ } else {
+ _eglLog(_EGL_WARNING, "Gralloc does not support lock_ycbcr!");
+ // HACK: Prepare a hardcoded ycrcb struct to prevent crashes while trying
+ // to create a YVU420_ANDROID or FLEX_YCbCr_420 (NV12) image with gralloc4
+ // see: b/225392099
+ if (buf->format == HAL_PIXEL_FORMAT_YV12) {
+ // HAL_PIXEL_FORMAT_YV12 => DRM_FORMAT_YVU420_ANDROID
+ // The stride of Android YV12 buffers is required to be aligned to 16 bytes
+ size_t luma_stride = ALIGN(buf->width, 32);
+ size_t chroma_stride = ALIGN(buf->width/2, 16);
+ ycbcr.y = 0;
+ ycbcr.cr = (void*)(luma_stride*buf->height);
+ ycbcr.cb = (void*)(luma_stride*buf->height+chroma_stride*buf->height/2);
+ ycbcr.ystride = luma_stride;
+ ycbcr.cstride = chroma_stride;
+ ycbcr.chroma_step = 1;
+ _eglLog(_EGL_WARNING,
+ "Using a hardcoded ycbcr struct for DRM_FORMAT_YVU420_ANDROID format.");
+ } else if (buf->format == HAL_PIXEL_FORMAT_YCbCr_420_888) {
+ // HAL_PIXEL_FORMAT_YCbCr_420_888 => DRM_FORMAT_FLEX_YCbCr_420_888
+ size_t luma_stride = buf->width;
+ size_t chroma_stride = buf->width;
+ ycbcr.y = 0;
+ ycbcr.cr = (void*)(luma_stride*buf->height+1);
+ ycbcr.cb = (void*)(luma_stride*buf->height);
+ ycbcr.ystride = luma_stride;
+ ycbcr.cstride = chroma_stride;
+ ycbcr.chroma_step = 2;
+ _eglLog(_EGL_WARNING,
+ "Using a hardcoded ycbcr struct for DRM_FORMAT_FLEX_YCbCr_420_888 format.");
+ } else {
+ _eglLog(_EGL_WARNING,
+ "Unable to create an image for native YUV format %x", buf->format);
+ return NULL;
+ }
}
- dri2_dpy->gralloc->unlock(dri2_dpy->gralloc, buf->handle);
/* When lock_ycbcr's usage argument contains no SW_READ/WRITE flags
* it will return the .y/.cb/.cr pointers based on a NULL pointer,