From 2f17431194efc5a13981550b004dd8d5d2a42e5e Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Fri, 20 Mar 2015 11:39:55 -0700 Subject: ImageFormat: add PRIVATE format Bug: 19865019 Change-Id: I1a9335fe1733a5b28d9cb20485b509fb216cb52b --- core/jni/android_view_Surface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/jni') diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index fff8604..f1c90ea 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -192,6 +192,9 @@ PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat( case HAL_PIXEL_FORMAT_YCbCr_422_I: // Name differs, though the value is the same return PublicFormat::YUY2; + case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: + // Name differs, though the value is the same + return PublicFormat::PRIVATE; case HAL_PIXEL_FORMAT_Y16: // Dataspace-dependent switch (dataSpace) { @@ -216,7 +219,6 @@ PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat( break; case HAL_PIXEL_FORMAT_BGRA_8888: case HAL_PIXEL_FORMAT_RAW_OPAQUE: - case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: // Not defined in public API return PublicFormat::UNKNOWN; -- cgit v1.1