LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gralloc: Modify getYUVPlaneInfo

Browse Source 
Modify getYUVPlaneInfo to return data from metadata
as well, if the geometry has changed, and align it
according to the format.

Change-Id: I119a1719c214c87e542b471c9cd9a20b01e2bf5e
This commit is contained in:
Kaushik Kanetkar
2015-01-22 23:16:26 -07:00
parent e8bb45d688
commit 071aca66e2
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libgralloc/alloc_controller.cpp
View File

@@ -37,6 +37,7 @@
#include "gr.h" #include "gr.h"
#include "comptype.h" #include "comptype.h"
#include "mdp_version.h" #include "mdp_version.h"
#include <qdMetaData.h>
#ifdef VENUS_COLOR_FORMAT #ifdef VENUS_COLOR_FORMAT
#include <media/msm_media_info.h> #include <media/msm_media_info.h>
@@ -623,9 +624,19 @@ void getBufferAttributes(int width, int height, int format, int usage,
int getYUVPlaneInfo(private_handle_t* hnd, struct android_ycbcr* ycbcr) int getYUVPlaneInfo(private_handle_t* hnd, struct android_ycbcr* ycbcr)
{ {
int err = 0; int err = 0;
int width = hnd->width;
int height = hnd->height;
unsigned int ystride, cstride; unsigned int ystride, cstride;
memset(ycbcr->reserved, 0, sizeof(ycbcr->reserved)); memset(ycbcr->reserved, 0, sizeof(ycbcr->reserved));
// Check metadata if the geometry has been updated.
MetaData_t *metadata = (MetaData_t *)hnd->base_metadata;
if(metadata && metadata->operation & UPDATE_BUFFER_GEOMETRY) {
AdrenoMemInfo::getInstance().getAlignedWidthAndHeight(metadata->bufferDim.sliceWidth,
metadata->bufferDim.sliceHeight, hnd->format, 0, width, height);
}
// Get the chroma offsets from the handle width/height. We take advantage // Get the chroma offsets from the handle width/height. We take advantage
// of the fact the width _is_ the stride // of the fact the width _is_ the stride
switch (hnd->format) { switch (hnd->format) {
@@ -634,10 +645,10 @@ int getYUVPlaneInfo(private_handle_t* hnd, struct android_ycbcr* ycbcr)
case HAL_PIXEL_FORMAT_YCbCr_422_SP: case HAL_PIXEL_FORMAT_YCbCr_422_SP:
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS: case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE: //Same as YCbCr_420_SP_VENUS case HAL_PIXEL_FORMAT_NV12_ENCODEABLE: //Same as YCbCr_420_SP_VENUS
ystride = cstride = hnd->width; ystride = cstride = width;
ycbcr->y = (void*)hnd->base; ycbcr->y = (void*)hnd->base;
ycbcr->cb = (void*)(hnd->base + ystride * hnd->height); ycbcr->cb = (void*)(hnd->base + ystride * height);
ycbcr->cr = (void*)(hnd->base + ystride * hnd->height + 1); ycbcr->cr = (void*)(hnd->base + ystride * height + 1);
ycbcr->ystride = ystride; ycbcr->ystride = ystride;
ycbcr->cstride = cstride; ycbcr->cstride = cstride;
ycbcr->chroma_step = 2; ycbcr->chroma_step = 2;
@@ -648,10 +659,10 @@ int getYUVPlaneInfo(private_handle_t* hnd, struct android_ycbcr* ycbcr)
case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO: case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
case HAL_PIXEL_FORMAT_NV21_ZSL: case HAL_PIXEL_FORMAT_NV21_ZSL:
case HAL_PIXEL_FORMAT_RAW_SENSOR: case HAL_PIXEL_FORMAT_RAW_SENSOR:
ystride = cstride = hnd->width; ystride = cstride = width;
ycbcr->y = (void*)hnd->base; ycbcr->y = (void*)hnd->base;
ycbcr->cr = (void*)(hnd->base + ystride * hnd->height); ycbcr->cr = (void*)(hnd->base + ystride * height);
ycbcr->cb = (void*)(hnd->base + ystride * hnd->height + 1); ycbcr->cb = (void*)(hnd->base + ystride * height + 1);
ycbcr->ystride = ystride; ycbcr->ystride = ystride;
ycbcr->cstride = cstride; ycbcr->cstride = cstride;
ycbcr->chroma_step = 2; ycbcr->chroma_step = 2;
@@ -659,16 +670,15 @@ int getYUVPlaneInfo(private_handle_t* hnd, struct android_ycbcr* ycbcr)
//Planar //Planar
case HAL_PIXEL_FORMAT_YV12: case HAL_PIXEL_FORMAT_YV12:
ystride = hnd->width; ystride = width;
cstride = ALIGN(hnd->width/2, 16); cstride = ALIGN(width/2, 16);
ycbcr->y = (void*)hnd->base; ycbcr->y = (void*)hnd->base;
ycbcr->cr = (void*)(hnd->base + ystride * hnd->height); ycbcr->cr = (void*)(hnd->base + ystride * height);
ycbcr->cb = (void*)(hnd->base + ystride * hnd->height + ycbcr->cb = (void*)(hnd->base + ystride * height +
cstride * hnd->height/2); cstride * height/2);
ycbcr->ystride = ystride; ycbcr->ystride = ystride;
ycbcr->cstride = cstride; ycbcr->cstride = cstride;
ycbcr->chroma_step = 1; ycbcr->chroma_step = 1;
break; break;
//Unsupported formats //Unsupported formats
case HAL_PIXEL_FORMAT_YCbCr_422_I: case HAL_PIXEL_FORMAT_YCbCr_422_I: