From 59793d75a462bb7a4ac2a7b94da284e3e8516a88 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 5 Jun 2014 11:24:52 -0700 Subject: [PATCH] camera_metadata: Hide input stream related key and enum Bug: 14622091 Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d --- camera/docs/docs.html | 5 +++-- camera/docs/metadata_properties.xml | 4 +++- camera/include/system/camera_metadata_tags.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/camera/docs/docs.html b/camera/docs/docs.html index de33816d..04abeeff 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -12062,7 +12062,7 @@ can be allocated at the same time.

int32 - [public] + [hidden] @@ -12352,7 +12352,8 @@ controls, but this capability only covers the above list of controls.The maximum available resolution for RAW_OPAQUE streams (both input/output) will match the maximum available resolution of JPEG streams. - + +

@hide this, TODO: remove it when input related APIs are ready.

  • DNG diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index f4553a2c..300f35ea 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -3027,7 +3027,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata - + The maximum numbers of any type of input streams that can be configured and used simultaneously by a camera device. @@ -3227,6 +3227,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata * The maximum available resolution for RAW_OPAQUE streams (both input/output) will match the maximum available resolution of JPEG streams. + + @hide this, TODO: remove it when input related APIs are ready. DNG diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index dd8aaf39..44262792 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -238,7 +238,7 @@ typedef enum camera_metadata_tag { ANDROID_REQUEST_TYPE, // enum | system ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS, // int32[] | hidden ANDROID_REQUEST_MAX_NUM_REPROCESS_STREAMS, // int32[] | system - ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS, // int32 | public + ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS, // int32 | hidden ANDROID_REQUEST_PIPELINE_DEPTH, // byte | public ANDROID_REQUEST_PIPELINE_MAX_DEPTH, // byte | public ANDROID_REQUEST_PARTIAL_RESULT_COUNT, // int32 | public -- 2.11.0