diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-09 07:33:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-09 07:33:21 +0000 |
| commit | 705cb78cc66b08e7e089de12b0d31e51b3722258 (patch) | |
| tree | 716bf7aeb8b65efcf4e5f20aea3142645f391f70 | |
| parent | 72e38021f4c8ebefe3c5072d3f078ca0b452d59f (diff) | |
| parent | 8737ef4222cff8f22e8dc7488477b09f53480eea (diff) | |
| download | media-705cb78cc66b08e7e089de12b0d31e51b3722258.tar.gz | |
release-request-9ff446ef-fe26-4f50-a0f0-c1d38619140f-for-git_oc-mr1-release-4257899 snap-temp-L58400000090817127
Change-Id: I61c35b8b363a1c257ec2185d6e33877b86c2c8c1
| -rw-r--r-- | camera/docs/metadata_helpers.py | 1 | ||||
| -rw-r--r-- | camera/docs/ndk_camera_metadata_tags.mako | 24 |
2 files changed, 21 insertions, 4 deletions
diff --git a/camera/docs/metadata_helpers.py b/camera/docs/metadata_helpers.py index a501524b..22d636f7 100644 --- a/camera/docs/metadata_helpers.py +++ b/camera/docs/metadata_helpers.py @@ -904,6 +904,7 @@ def ndkdoc(metadata, indent = 4): """ def ndkdoc_formatter(text): # render with markdown => HTML + # Turn off the table plugin since doxygen doesn't recognize generated <thead> <tbody> tags ndktext = md(text, NDKDOC_IMAGE_SRC_METADATA, False) # Convert metadata entry "android.x.y.z" to form diff --git a/camera/docs/ndk_camera_metadata_tags.mako b/camera/docs/ndk_camera_metadata_tags.mako index 8232e508..f2ba1b0f 100644 --- a/camera/docs/ndk_camera_metadata_tags.mako +++ b/camera/docs/ndk_camera_metadata_tags.mako @@ -36,13 +36,20 @@ #ifndef _NDK_CAMERA_METADATA_TAGS_H #define _NDK_CAMERA_METADATA_TAGS_H + +#include <sys/cdefs.h> + +__BEGIN_DECLS + +#if __ANDROID_API__ >= 24 <%! + from metadata_helpers import csym def annotated_type(entry): type = entry.type if entry.container == 'array': type += '[' + '*'.join(entry.container_sizes) + ']' if entry.enum: - type += ' (enum)' + type += ' (acamera_metadata_enum_%s_t)'%(csym(entry.name).lower()) return type %>\ @@ -85,9 +92,13 @@ typedef enum acamera_metadata_tag { % else: % if entry.description or entry.details: /** + % if entry.description: ${entry.description | ndkdoc(metadata)}\ + % endif * - * <p>This tag may appear in:</p> + * <p>Type: ${annotated_type(entry)}</p> + * + * <p>This tag may appear in: * <ul> % if metadata.is_entry_this_kind(entry, 'static'): * <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li> @@ -98,9 +109,11 @@ ${entry.description | ndkdoc(metadata)}\ % if metadata.is_entry_this_kind(entry, 'controls'): * <li>ACaptureRequest</li> % endif - * </ul> + * </ul></p> * + % if entry.details: ${entry.details | ndkdoc(metadata)}\ + % endif */ % endif ${ndk(entry.name) + " = " | csym,ljust(60)}// ${annotated_type(entry)} @@ -179,7 +192,10 @@ ${val.notes | ndkdoc(metadata)}\ % endfor % endfor +#endif /* __ANDROID_API__ >= 24 */ + +__END_DECLS -#endif //_NDK_CAMERA_METADATA_TAGS_H +#endif /* _NDK_CAMERA_METADATA_TAGS_H */ /** @} */ |