diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-03-30 23:46:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-30 23:46:12 +0000 |
| commit | 8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b (patch) | |
| tree | 81f99b253a74c14c2e8817021a182a41dde95197 /core/jni/android_view_Surface.cpp | |
| parent | 673cec6ab58148a88e36b1b156e848a35db07228 (diff) | |
| parent | 2f17431194efc5a13981550b004dd8d5d2a42e5e (diff) | |
| download | frameworks_base-8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b.zip frameworks_base-8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b.tar.gz frameworks_base-8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b.tar.bz2 | |
Merge "ImageFormat: add PRIVATE format"
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
| -rw-r--r-- | core/jni/android_view_Surface.cpp | 4 |
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; |