From: Zhijun He <zhijunhe@google.com>
Date: Tue, 4 Feb 2014 19:32:24 +0000 (-0800)
Subject: camera_metadata: Deprecate some tags
X-Git-Tag: android-x86-7.1-r1~393
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb4701f0dd0198c8d3c58d0f61263cc148a24139;p=android-x86%2Fsystem-media.git

camera_metadata: Deprecate some tags

Change-Id: I3ee67d39492a2d3c58b1edc5491e7cbd1709a981
---

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 454dd585..404f4838 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -8510,6 +8510,7 @@ and output (face rectangles).<wbr/></p>
             </td>
 
             <td class="entry_range">
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -8558,6 +8559,7 @@ trigger.<wbr/></p>
             </td>
 
             <td class="entry_range">
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -8605,6 +8607,7 @@ shutter lag stream</p>
             </td>
 
             <td class="entry_range">
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -8844,7 +8847,7 @@ frameCount value).<wbr/></p>
             </td>
 
             <td class="entry_range">
-              <p>Any int</p>
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/> Any int.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -8922,8 +8925,8 @@ for the source of reprocessing data.<wbr/></p>
             </td>
 
             <td class="entry_range">
-              <p>Typically,<wbr/> only one entry allowed,<wbr/> must be a valid
-reprocess stream ID.<wbr/></p>
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/></p>
+<p>Typically,<wbr/> only one entry allowed,<wbr/> must be a valid reprocess stream ID.<wbr/></p>
 <p>If android.<wbr/>jpeg.<wbr/>needs<wbr/>Thumbnail is set,<wbr/> then multiple
 reprocess streams may be included in a single request; they
 must be different scaled versions of the same image.<wbr/></p>
@@ -9029,7 +9032,7 @@ from this capture must be sent to</p>
             </td>
 
             <td class="entry_range">
-              <p>List must only include streams that have been
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/> List must only include streams that have been
 created</p>
             </td>
 
@@ -9526,7 +9529,7 @@ from this capture must be sent to</p>
             </td>
 
             <td class="entry_range">
-              <p>List must only include streams that have been
+              <p><strong>Deprecated</strong>.<wbr/> Do not use.<wbr/> List must only include streams that have been
 created</p>
             </td>
 
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 4be8e165..bc657b39 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2327,6 +2327,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           scale 'normalized' coordinates with respect to the crop
           region. This applies to metering input (a{e,f,wb}Region
           and output (face rectangles).</description>
+          <range>**Deprecated**. Do not use.</range>
           <details>Normalized coordinates refer to those in the
           (-1000,1000) range mentioned in the
           android.hardware.Camera API.
@@ -2340,6 +2341,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>If set to 1, then the camera service always
           switches to FOCUS_MODE_AUTO before issuing a AF
           trigger.</description>
+          <range>**Deprecated**. Do not use.</range>
           <details>HAL implementations should implement AF trigger
           modes for AUTO, MACRO, CONTINUOUS_FOCUS, and
           CONTINUOUS_PICTURE modes instead of using this flag. Does
@@ -2351,6 +2353,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           CAMERA2_PIXEL_FORMAT_ZSL instead of
           HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED for the zero
           shutter lag stream</description>
+          <range>**Deprecated**. Do not use.</range>
           <details>HAL implementations should use gralloc usage flags
           to determine that a stream will be used for
           zero-shutter-lag, instead of relying on an explicit
@@ -2425,7 +2428,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           frameCount value).
           </description>
           <units>incrementing integer</units>
-          <range>Any int</range>
+          <range>**Deprecated**. Do not use. Any int.</range>
         </entry>
         <entry name="id" type="int32" visibility="hidden">
           <description>An application-specified ID for the current
@@ -2443,8 +2446,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>List which camera reprocess stream is used
           for the source of reprocessing data.</description>
           <units>List of camera reprocess stream IDs</units>
-          <range>Typically, only one entry allowed, must be a valid
-          reprocess stream ID.
+          <range>**Deprecated**. Do not use.
+
+          Typically, only one entry allowed, must be a valid reprocess stream ID.
 
           If android.jpeg.needsThumbnail is set, then multiple
           reprocess streams may be included in a single request; they
@@ -2481,7 +2485,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Lists which camera output streams image data
           from this capture must be sent to</description>
           <units>List of camera stream IDs</units>
-          <range>List must only include streams that have been
+          <range>**Deprecated**. Do not use. List must only include streams that have been
           created</range>
           <details>If no output streams are listed, then the image
           data should simply be discarded. The image data must