camera2: Move parameters around to android.hardware.camera2.params

* Also add the android.statistics.faces synthetic key;
  - this removes the hardcoded key from CaptureResult.java

Bug: 14628001
Change-Id: Ie7a82bf9f4a0d8c18e0dc3a1581123c0d95da3f0

diff --git a/camera/docs/CameraMetadataKeys.mako b/camera/docs/CameraMetadataKeys.mako
index dd641a0..27da332 100644 (file)
--- a/camera/docs/CameraMetadataKeys.mako
+++ b/camera/docs/CameraMetadataKeys.mako
@@ -111,4 +111,4 @@ ${generate_key(entry)}
 ${single_kind_keys(java_class, xml_kind)}\
     /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
      * End generated code
-     *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/
+     *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/
\ No newline at end of file

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 29c810b..bba05ad 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -847,6 +847,8 @@
             <li
             ><a href="#dynamic_android.statistics.faceScores">android.statistics.faceScores</a></li>
             <li
+            ><a href="#dynamic_android.statistics.faces">android.statistics.faces</a></li>
+            <li
             ><a href="#dynamic_android.statistics.histogram">android.statistics.histogram</a></li>
             <li
             ><a href="#dynamic_android.statistics.histogramMode">android.statistics.histogramMode</a></li>
@@ -13569,9 +13571,6 @@ smaller than what the camera (e.<wbr/>g.<wbr/> maximum resolution is 3264x2448)
 can provide.<wbr/></p>
 <p>Please reference the documentation for the image data destination to
 check if it limits the maximum size for image data.<wbr/></p>
-<p>Not all output formats may be supported in a configuration with
-an input stream of a particular format.<wbr/> For more details,<wbr/> see
-<a href="#static_android.scaler.availableInputOutputFormatsMap">android.<wbr/>scaler.<wbr/>available<wbr/>Input<wbr/>Output<wbr/>Formats<wbr/>Map</a>.<wbr/></p>
 <p>The following table describes the minimum required output stream
 configurations based on the hardware level
 (<a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a>):</p>
@@ -13648,6 +13647,9 @@ mandatory stream configurations on a per-capability basis.<wbr/></p>
               <p>Do not set this property directly
 (it is synthetic and will not be available at the HAL layer);
 set the <a href="#static_android.scaler.availableStreamConfigurations">android.<wbr/>scaler.<wbr/>available<wbr/>Stream<wbr/>Configurations</a> instead.<wbr/></p>
+<p>Not all output formats may be supported in a configuration with
+an input stream of a particular format.<wbr/> For more details,<wbr/> see
+<a href="#static_android.scaler.availableInputOutputFormatsMap">android.<wbr/>scaler.<wbr/>available<wbr/>Input<wbr/>Output<wbr/>Formats<wbr/>Map</a>.<wbr/></p>
 <p>It is recommended (but not mandatory) to also include half/<wbr/>quarter
 of sensor maximum resolution for JPEG formats (regardless of hardware
 level).<wbr/></p>
@@ -17738,6 +17740,56 @@ meaningful (for example,<wbr/> setting 100 at all times is illegal).<wbr/></p>
            <!-- end of entry -->
         
                 
+          <tr class="entry" id="dynamic_android.statistics.faces">
+            <td class="entry_name
+             " rowspan="3">
+              android.<wbr/>statistics.<wbr/>faces
+            </td>
+            <td class="entry_type">
+                <span class="entry_type_name">int32</span>
+                <span class="entry_type_container">x</span>
+
+                <span class="entry_type_array">
+                  n
+                </span>
+              <span class="entry_type_visibility"> [public as face]</span>
+
+              <span class="entry_type_synthetic">[synthetic] </span>
+
+
+
+
+            </td> <!-- entry_type -->
+
+            <td class="entry_description">
+              <p>List of the faces detected through camera face detection
+in this result.<wbr/></p>
+            </td>
+
+            <td class="entry_units">
+            </td>
+
+            <td class="entry_range">
+            </td>
+
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <p>Only available if <a href="#controls_android.statistics.faceDetectMode">android.<wbr/>statistics.<wbr/>face<wbr/>Detect<wbr/>Mode</a> <code>!=</code> OFF.<wbr/></p>
+            </td>
+          </tr>
+
+
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
+        
+                
           <tr class="entry" id="dynamic_android.statistics.histogram">
             <td class="entry_name
              " rowspan="3">

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index d20182e..96b2c35 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
       <language name="java">android.graphics.Rect</language>
     </typedef>
     <typedef name="size">
-      <language name="java">android.hardware.camera2.Size</language>
+      <language name="java">android.util.Size</language>
     </typedef>
     <typedef name="string">
       <language name="java">String</language>
@@ -73,6 +73,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
     <typedef name="streamConfigurationDuration">
       <language name="java">android.hardware.camera2.params.StreamConfigurationDuration</language>
     </typedef>
+    <typedef name="face">
+      <language name="java">android.hardware.camera2.params.Face</language>
+    </typedef>
   </types>
 
   <namespace name="android">
@@ -3738,10 +3741,6 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           Please reference the documentation for the image data destination to
           check if it limits the maximum size for image data.
 
-          Not all output formats may be supported in a configuration with
-          an input stream of a particular format. For more details, see
-          android.scaler.availableInputOutputFormatsMap.
-
           The following table describes the minimum required output stream
           configurations based on the hardware level
           (android.info.supportedHardwareLevel):
@@ -3765,6 +3764,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           (it is synthetic and will not be available at the HAL layer);
           set the android.scaler.availableStreamConfigurations instead.
 
+          Not all output formats may be supported in a configuration with
+          an input stream of a particular format. For more details, see
+          android.scaler.availableInputOutputFormatsMap.
+
           It is recommended (but not mandatory) to also include half/quarter
           of sensor maximum resolution for JPEG formats (regardless of hardware
           level).
@@ -4964,6 +4967,16 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           meaningful (for example, setting 100 at all times is illegal).</details>
           <tag id="BC" />
         </entry>
+        <entry name="faces" type="int32" visibility="public" synthetic="true" container="array" typedef="face">
+          <array>
+            <size>n</size>
+          </array>
+          <description>List of the faces detected through camera face detection
+          in this result.</description>
+          <details>
+          Only available if android.statistics.faceDetectMode `!=` OFF.
+          </details>
+        </entry>
         <entry name="histogram" type="int32"
         type_notes="count of pixels for each color channel that fall into each histogram bucket, scaled to be between 0 and maxHistogramCount"
         container="array">