LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev

Browse Source 
* commit 'f0063b298b078df61d7b80bfdbb9ea28515ed615':
  Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
This commit is contained in:
Eino-Ville Talvala
2012-09-04 12:29:29 -07:00
committed by Android Git Automerger
parent 3cb39916c1 f0063b298b
commit 7e2ae6af74
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/emulator/opengl/system/gralloc/gralloc.cpp
View File

@@ -165,8 +165,7 @@ static int gralloc_alloc(alloc_device_t* dev,
} else if (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER) { } else if (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER) {
// Camera-to-encoder is NV21 // Camera-to-encoder is NV21
format = HAL_PIXEL_FORMAT_YCrCb_420_SP; format = HAL_PIXEL_FORMAT_YCrCb_420_SP;
} else if ((usage & GRALLOC_USAGE_HW_CAMERA_MASK) == } else if (usage & GRALLOC_USAGE_HW_CAMERA_ZSL) {
GRALLOC_USAGE_HW_CAMERA_ZSL) {
// Camera-to-ZSL-queue is RGB_888 // Camera-to-ZSL-queue is RGB_888
format = HAL_PIXEL_FORMAT_RGB_888; format = HAL_PIXEL_FORMAT_RGB_888;
} }
@@ -615,14 +614,11 @@ static int gralloc_lock(gralloc_module_t const* module,
bool hw_write = (usage & GRALLOC_USAGE_HW_RENDER); bool hw_write = (usage & GRALLOC_USAGE_HW_RENDER);
bool hw_vid_enc_read = (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER); bool hw_vid_enc_read = (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER);
bool hw_cam_write = (usage & GRALLOC_USAGE_HW_CAMERA_WRITE); bool hw_cam_write = (usage & GRALLOC_USAGE_HW_CAMERA_WRITE);
bool hw_cam_read = (usage & GRALLOC_USAGE_HW_CAMERA_READ);
bool sw_read_allowed = (0 != (cb->usage & GRALLOC_USAGE_SW_READ_MASK)); bool sw_read_allowed = (0 != (cb->usage & GRALLOC_USAGE_SW_READ_MASK));
bool sw_write_allowed = (0 != (cb->usage & GRALLOC_USAGE_SW_WRITE_MASK)); bool sw_write_allowed = (0 != (cb->usage & GRALLOC_USAGE_SW_WRITE_MASK));
if ( (hw_read || hw_write) || if ( (hw_read || hw_write) ||
(!sw_read && !sw_write && (!sw_read && !sw_write && !hw_cam_write && !hw_vid_enc_read) ||
!hw_cam_write && !hw_cam_read &&
!hw_vid_enc_read) ||
(sw_read && !sw_read_allowed) || (sw_read && !sw_read_allowed) ||
(sw_write && !sw_write_allowed) ) { (sw_write && !sw_write_allowed) ) {
ALOGE("gralloc_lock usage mismatch usage=0x%x cb->usage=0x%x\n", usage, ALOGE("gralloc_lock usage mismatch usage=0x%x cb->usage=0x%x\n", usage,
@@ -636,9 +632,7 @@ static int gralloc_lock(gralloc_module_t const* module,
// //
// make sure ashmem area is mapped if needed // make sure ashmem area is mapped if needed
// //
if (cb->canBePosted() || sw_read || sw_write || if (cb->canBePosted() || sw_read || sw_write || hw_cam_write || hw_vid_enc_read) {
hw_cam_write || hw_cam_read ||
hw_vid_enc_read) {
if (cb->ashmemBasePid != getpid() || !cb->ashmemBase) { if (cb->ashmemBasePid != getpid() || !cb->ashmemBase) {
return -EACCES; return -EACCES;
} }
@@ -675,7 +669,7 @@ static int gralloc_lock(gralloc_module_t const* module,
// //
// is virtual address required ? // is virtual address required ?
// //
if (sw_read || sw_write || hw_cam_write || hw_cam_read || hw_vid_enc_read) { if (sw_read || sw_write || hw_cam_write || hw_vid_enc_read) {
*vaddr = cpu_addr; *vaddr = cpu_addr;
} }