diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-02-09 19:11:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-09 19:11:29 +0000 |
| commit | ace064f76eb4a43b9737438a1ebf52b7ca04cbc8 (patch) | |
| tree | 6dfefb4e6980ff591f1aa5e346c161d8255a44b9 /camera/src | |
| parent | e7cd5568cdc6e9ec601c9f110605af53aad7a118 (diff) | |
| parent | 993d4c4cb381b1a9fee5f8c37b7c427dc8966f90 (diff) | |
| download | android_system_media-ace064f76eb4a43b9737438a1ebf52b7ca04cbc8.tar.gz android_system_media-ace064f76eb4a43b9737438a1ebf52b7ca04cbc8.tar.bz2 android_system_media-ace064f76eb4a43b9737438a1ebf52b7ca04cbc8.zip | |
Merge "Camera2: tonemapping related HAL3.3 update"
Diffstat (limited to 'camera/src')
| -rw-r--r-- | camera/src/camera_metadata_tag_info.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c index 0c26f7da..0a5479ea 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -584,6 +584,10 @@ static tag_info_t android_tonemap[ANDROID_TONEMAP_END - { "curveRed", TYPE_FLOAT }, [ ANDROID_TONEMAP_MODE - ANDROID_TONEMAP_START ] = { "mode", TYPE_BYTE }, + [ ANDROID_TONEMAP_GAMMA - ANDROID_TONEMAP_START ] = + { "gamma", TYPE_FLOAT }, + [ ANDROID_TONEMAP_PRESET_CURVE - ANDROID_TONEMAP_START ] = + { "presetCurve", TYPE_BYTE }, [ ANDROID_TONEMAP_MAX_CURVE_POINTS - ANDROID_TONEMAP_START ] = { "maxCurvePoints", TYPE_INT32 }, [ ANDROID_TONEMAP_AVAILABLE_TONE_MAP_MODES - ANDROID_TONEMAP_START ] = @@ -2289,6 +2293,32 @@ int camera_metadata_enum_snprint(uint32_t tag, msg = "HIGH_QUALITY"; ret = 0; break; + case ANDROID_TONEMAP_MODE_GAMMA_VALUE: + msg = "GAMMA_VALUE"; + ret = 0; + break; + case ANDROID_TONEMAP_MODE_PRESET_CURVE: + msg = "PRESET_CURVE"; + ret = 0; + break; + default: + msg = "error: enum value out of range"; + } + break; + } + case ANDROID_TONEMAP_GAMMA: { + break; + } + case ANDROID_TONEMAP_PRESET_CURVE: { + switch (value) { + case ANDROID_TONEMAP_PRESET_CURVE_SRGB: + msg = "SRGB"; + ret = 0; + break; + case ANDROID_TONEMAP_PRESET_CURVE_REC709: + msg = "REC709"; + ret = 0; + break; default: msg = "error: enum value out of range"; } |