diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2024-03-22 21:41:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-22 21:41:19 +0000 |
| commit | e483afc45fb869b9551150bd27fbba751e1632b5 (patch) | |
| tree | d822c12ea87118ff9906d086f1a43dc4f54bf3f7 | |
| parent | 3f8efff12e002b181b25020bba92af9939940712 (diff) | |
| parent | c7fc1f9b5b02294325bd9fb8cb73f50374a677aa (diff) | |
| download | media-e483afc45fb869b9551150bd27fbba751e1632b5.tar.gz | |
Merge "camera: Fix incorrectly generated ndk enums" into main
| -rw-r--r-- | camera/docs/ndk_camera_metadata_tags.mako | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/camera/docs/ndk_camera_metadata_tags.mako b/camera/docs/ndk_camera_metadata_tags.mako index c2bb859d..eb72dea6 100644 --- a/camera/docs/ndk_camera_metadata_tags.mako +++ b/camera/docs/ndk_camera_metadata_tags.mako @@ -41,6 +41,21 @@ __BEGIN_DECLS +/* + * Note: The following enum values were incorrect and have been updated: + * enum old value updated value + * ACAMERA_CONTROL_SETTINGS_OVERRIDE ACAMERA_CONTROL_START + 49 ACAMERA_CONTROL_START + 52; + * ACAMERA_CONTROL_AVAILABLE_SETTINGS_OVERRIDES ACAMERA_CONTROL_START + 50 ACAMERA_CONTROL_START + 53; + * ACAMERA_CONTROL_AUTOFRAMING ACAMERA_CONTROL_START + 52 ACAMERA_CONTROL_START + 55; + * ACAMERA_CONTROL_AUTOFRAMING_AVAILABLE ACAMERA_CONTROL_START + 53 ACAMERA_CONTROL_START + 56; + * ACAMERA_CONTROL_AUTOFRAMING_STATE ACAMERA_CONTROL_START + 54 ACAMERA_CONTROL_START + 57; + * ACAMERA_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE ACAMERA_CONTROL_START + 55 ACAMERA_CONTROL_START + 58; + * ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE ACAMERA_CONTROL_START + 56 ACAMERA_CONTROL_START + 59; + + * ACAMERA_SCALER_AVAILABLE_STREAM_USE_CASES ACAMERA_SCALER_START + 25 ACAMERA_SCALER_START + 26; + * ACAMERA_SCALER_CROP_REGION ACAMERA_SCALER_START + 26 ACAMERA_SCALER_START + 27; + */ + <%! from metadata_helpers import csym def annotated_type(entry): @@ -84,7 +99,7 @@ typedef enum acamera_metadata_tag { if skip_sec: continue %>\ - % for idx,entry in enumerate(remove_hal_non_visible(find_unique_entries(sec))): + % for idx,entry in enumerate(remove_synthetic(find_unique_entries(sec))): % if entry.applied_ndk_visible == "true": % if entry.deprecated: ${ndk(entry.name) + " = " | csym,ljust(60)}// Deprecated! DO NOT USE |