summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-06-11 16:48:13 -0700
committerChien-Yu Chen <cychen@google.com>2015-06-17 11:03:04 -0700
commit0782aab077b32613c6715190135008dbf3dc5d6d (patch)
treed8f1f0c1e701e943884534d91260f2235a1786a9 /core/java/android/hardware
parent98b40aac8399d8befc5099955a34ce54df477d8f (diff)
downloadframeworks_base-0782aab077b32613c6715190135008dbf3dc5d6d.zip
frameworks_base-0782aab077b32613c6715190135008dbf3dc5d6d.tar.gz
frameworks_base-0782aab077b32613c6715190135008dbf3dc5d6d.tar.bz2
ImageReader: Fix format workarounds for legacy devices
Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the workaround when returning the format. Remove the workaround in legacy shim that overrides YUV_420_888 to YV12 because allocating YUV_420_888 buffers with SW access is supported on Flo. Bug: 21707937 Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java b/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
index f928a55..bc80fc1 100644
--- a/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
+++ b/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
@@ -630,8 +630,6 @@ public class SurfaceTextureRenderer {
holder.width = surfaceSize.getWidth();
holder.height = surfaceSize.getHeight();
if (LegacyCameraDevice.needsConversion(s)) {
- // Always override to YV12 output for YUV surface formats.
- LegacyCameraDevice.setSurfaceFormat(s, ImageFormat.YV12);
mConversionSurfaces.add(holder);
} else {
mSurfaces.add(holder);