diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-05-16 17:49:35 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-05-17 11:56:32 -0700 |
| commit | c2eebfffbaeb9da4093d3cd1a323974dbb2b164d (patch) | |
| tree | 025e496087dc890884c84d9c602a4de62356da89 | |
| parent | bd7f15b4123546106acb95657289026f4da5a813 (diff) | |
| download | media-c2eebfffbaeb9da4093d3cd1a323974dbb2b164d.tar.gz | |
Camera: Metadata: Fix color format dump issue
There are typos and missing color formats in metadata property file, which makes
metadata dump produce misleading logs.
This is debug only change, shouldn't impact any functionality.
Bug: 8970663
Change-Id: If6b9bac9c88db993be51f6eb22ad8821d70abf51
| -rw-r--r-- | camera/docs/docs.html | 16 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 15 | ||||
| -rw-r--r-- | camera/include/system/camera_metadata_tags.h | 6 | ||||
| -rw-r--r-- | camera/src/camera_metadata_tag_info.c | 16 |
4 files changed, 41 insertions, 12 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 5b1961f4..5cac284b 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -6810,14 +6810,24 @@ <span class="entry_type_enum_notes">YCrCb 4:2:0 Planar</span> </li> <li> - <span class="entry_type_enum_name">YCbCr_420_SP</span> + <span class="entry_type_enum_name">YCrCb_420_SP</span> <span class="entry_type_enum_value">0x11</span> <span class="entry_type_enum_notes">NV21</span> </li> <li> - <span class="entry_type_enum_name">JPEG</span> + <span class="entry_type_enum_name">IMPLEMENTATION_DEFINED</span> + <span class="entry_type_enum_value">0x22</span> + <span class="entry_type_enum_notes">Hal Implementation Defined</span> + </li> + <li> + <span class="entry_type_enum_name">YCbCr_420_888</span> + <span class="entry_type_enum_value">0x23</span> + <span class="entry_type_enum_notes">Flexible YUV420 Format</span> + </li> + <li> + <span class="entry_type_enum_name">BLOB</span> <span class="entry_type_enum_value">0x21</span> - <span class="entry_type_enum_notes">BLOB</span> + <span class="entry_type_enum_notes">JPEG</span> </li> </ul> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index 6e688aaf..41ae5042 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -1564,11 +1564,20 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <value id="0x32315659">YV12 <notes>YCrCb 4:2:0 Planar</notes> </value> - <value id="0x11">YCbCr_420_SP + <value id="0x11">YCrCb_420_SP <notes>NV21</notes> </value> - <value id="0x21">JPEG - <notes>BLOB</notes> + + <value id="0x22">IMPLEMENTATION_DEFINED + <notes>Hal Implementation Defined</notes> + </value> + + <value id="0x23">YCbCr_420_888 + <notes>Flexible YUV420 Format</notes> + </value> + + <value id="0x21">BLOB + <notes>JPEG</notes> </value> </enum> <description>List of app-visible formats</description> diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index 729bcd17..6ff3f5f3 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -566,8 +566,10 @@ typedef enum camera_metadata_enum_android_request_type { typedef enum camera_metadata_enum_android_scaler_available_formats { ANDROID_SCALER_AVAILABLE_FORMATS_RAW_SENSOR = 0x20, ANDROID_SCALER_AVAILABLE_FORMATS_YV12 = 0x32315659, - ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_SP = 0x11, - ANDROID_SCALER_AVAILABLE_FORMATS_JPEG = 0x21, + ANDROID_SCALER_AVAILABLE_FORMATS_YCrCb_420_SP = 0x11, + ANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED = 0x22, + ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888 = 0x23, + ANDROID_SCALER_AVAILABLE_FORMATS_BLOB = 0x21, } camera_metadata_enum_android_scaler_available_formats_t; diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c index a1d303ee..5b1d424f 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -1453,12 +1453,20 @@ int camera_metadata_enum_snprint(uint32_t tag, msg = "YV12"; ret = 0; break; - case ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_SP: - msg = "YCbCr_420_SP"; + case ANDROID_SCALER_AVAILABLE_FORMATS_YCrCb_420_SP: + msg = "YCrCb_420_SP"; ret = 0; break; - case ANDROID_SCALER_AVAILABLE_FORMATS_JPEG: - msg = "JPEG"; + case ANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED: + msg = "IMPLEMENTATION_DEFINED"; + ret = 0; + break; + case ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888: + msg = "YCbCr_420_888"; + ret = 0; + break; + case ANDROID_SCALER_AVAILABLE_FORMATS_BLOB: + msg = "BLOB"; ret = 0; break; default: |