Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Relax constraints on valid ImageReader usage flags" into pi-dev

Browse Source 
am: fa43016626

Change-Id: I6e72c51e84a3d44fe2b7a5c53ee5b8627a823336
This commit is contained in:
Clément Julliard
2018-03-28 00:42:25 +00:00
committed by android-build-merger
parent f38fe4393e fa43016626
commit a60cdac406
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/ImageReader.java
View File

@@ -727,18 +727,7 @@ public class ImageReader implements AutoCloseable {
return false; return false;
} }
if (format == ImageFormat.PRIVATE) { return true;
// Usage need to be either USAGE0_GPU_SAMPLED_IMAGE or USAGE0_VIDEO_ENCODE or combined.
boolean isAllowed = (usage == HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
isAllowed = isAllowed || (usage == HardwareBuffer.USAGE_VIDEO_ENCODE);
isAllowed = isAllowed || (usage ==
(HardwareBuffer.USAGE_VIDEO_ENCODE | HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE));
return isAllowed;
} else {
// Usage need to make the buffer CPU readable for explicit format.
return ((usage == HardwareBuffer.USAGE_CPU_READ_RARELY) ||
(usage == HardwareBuffer.USAGE_CPU_READ_OFTEN));
}
} }
/** /**