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

Merge "Adjust graphics dataspace references to new standard" into nyc-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2016-03-16 22:49:35 +00:00
committed by Android (Google) Code Review
parent 9597276801 7966d446cd
commit 61adad884b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/hardware/camera2/params/StreamConfigurationMap.java
View File

@@ -1196,7 +1196,7 @@ public final class StreamConfigurationMap {
*
* <p>In particular these formats are converted:
* <ul>
* <li>ImageFormat.JPEG => HAL_DATASPACE_JFIF
* <li>ImageFormat.JPEG => HAL_DATASPACE_V0_JFIF
* <li>ImageFormat.DEPTH_POINT_CLOUD => HAL_DATASPACE_DEPTH
* <li>ImageFormat.DEPTH16 => HAL_DATASPACE_DEPTH
* <li>others => HAL_DATASPACE_UNKNOWN
@@ -1223,7 +1223,7 @@ public final class StreamConfigurationMap {
static int imageFormatToDataspace(int format) {
switch (format) {
case ImageFormat.JPEG:
return HAL_DATASPACE_JFIF;
return HAL_DATASPACE_V0_JFIF;
case ImageFormat.DEPTH_POINT_CLOUD:
case ImageFormat.DEPTH16:
return HAL_DATASPACE_DEPTH;
@@ -1633,8 +1633,16 @@ public final class StreamConfigurationMap {
private static final int HAL_PIXEL_FORMAT_Y16 = 0x20363159;
private static final int HAL_DATASPACE_STANDARD_SHIFT = 16;
private static final int HAL_DATASPACE_TRANSFER_SHIFT = 22;
private static final int HAL_DATASPACE_RANGE_SHIFT = 27;
private static final int HAL_DATASPACE_UNKNOWN = 0x0;
private static final int HAL_DATASPACE_JFIF = 0x101;
private static final int HAL_DATASPACE_V0_JFIF =
(2 << HAL_DATASPACE_STANDARD_SHIFT) |
(3 << HAL_DATASPACE_TRANSFER_SHIFT) |
(1 << HAL_DATASPACE_RANGE_SHIFT);
private static final int HAL_DATASPACE_DEPTH = 0x1000;
private static final long DURATION_20FPS_NS = 50000000L;

6
core/jni/android_view_Surface.cpp
View File

@@ -144,7 +144,7 @@ android_dataspace android_view_Surface_mapPublicFormatToHalDataspace(
PublicFormat f) {
switch(f) {
case PublicFormat::JPEG:
return HAL_DATASPACE_JFIF;
return HAL_DATASPACE_V0_JFIF;
case PublicFormat::DEPTH_POINT_CLOUD:
case PublicFormat::DEPTH16:
return HAL_DATASPACE_DEPTH;
@@ -156,7 +156,7 @@ android_dataspace android_view_Surface_mapPublicFormatToHalDataspace(
case PublicFormat::YUV_420_888:
case PublicFormat::NV21:
case PublicFormat::YV12:
return HAL_DATASPACE_JFIF;
return HAL_DATASPACE_V0_JFIF;
default:
// Most formats map to UNKNOWN
return HAL_DATASPACE_UNKNOWN;
@@ -210,7 +210,7 @@ PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat(
switch (dataSpace) {
case HAL_DATASPACE_DEPTH:
return PublicFormat::DEPTH_POINT_CLOUD;
case HAL_DATASPACE_JFIF:
case HAL_DATASPACE_V0_JFIF:
return PublicFormat::JPEG;
default:
// Assume otherwise-marked blobs are also JPEG