summaryrefslogtreecommitdiffstats
path: root/core/jni/android_view_Surface.cpp
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2015-03-20 11:39:55 -0700
committerZhijun He <zhijunhe@google.com>2015-03-30 16:17:35 -0700
commit2f17431194efc5a13981550b004dd8d5d2a42e5e (patch)
tree688fa9c58004aa592bb37349b3678bcb545180f6 /core/jni/android_view_Surface.cpp
parent8a78286915a8f71eb09b5ae29a3bd8fb977180e6 (diff)
downloadframeworks_base-2f17431194efc5a13981550b004dd8d5d2a42e5e.zip
frameworks_base-2f17431194efc5a13981550b004dd8d5d2a42e5e.tar.gz
frameworks_base-2f17431194efc5a13981550b004dd8d5d2a42e5e.tar.bz2
ImageFormat: add PRIVATE format
Bug: 19865019 Change-Id: I1a9335fe1733a5b28d9cb20485b509fb216cb52b
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
-rw-r--r--core/jni/android_view_Surface.cpp4
1 files changed, 3 insertions, 1 deletions
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;