OSDN Git Service

Camera: Metadata: Fix the activeArraySize typo.
authorZhijun He <zhijunhe@google.com>
Mon, 13 May 2013 23:59:51 +0000 (16:59 -0700)
committerZhijun He <zhijunhe@google.com>
Tue, 14 May 2013 00:07:57 +0000 (17:07 -0700)
Bug: 8778377
Change-Id: I1b0724cdc5d72ca54f8b88d101ef13601a95c4fb

camera/docs/docs.html
camera/docs/metadata_properties.xml

index 49b535b..5b1961f 100644 (file)
             <td class="entry_units">
               (x,<wbr>y) of top-left corner,<wbr> width and height of region
           in pixels; (0,<wbr>0) is top-left corner of
-          android.<wbr>sensor.<wbr>active<wbr>Pixel<wbr>Array
+          android.<wbr>sensor.<wbr>active<wbr>Array<wbr>Size
             </td>
 
             <td class="entry_range">
             rounded to nearest larger supportable width,<wbr> especially
             for raw output,<wbr> where only a few fixed scales may be
             possible.<wbr> The width and height of the crop region cannot
-            be set to be smaller than floor( activePixelArray.<wbr>width /<wbr>
+            be set to be smaller than floor( activeArraySize.<wbr>width /<wbr>
             android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom ) and floor(
-            activePixelArray.<wbr>height /<wbr> android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom),<wbr>
+            activeArraySize.<wbr>height /<wbr> android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom),<wbr>
             respectively.<wbr>
           
             </td>
             <td class="entry_units">
               (x,<wbr>y) of top-left corner,<wbr> width and height of region
           in pixels; (0,<wbr>0) is top-left corner of
-          android.<wbr>sensor.<wbr>active<wbr>Pixel<wbr>Array
+          android.<wbr>sensor.<wbr>active<wbr>Array<wbr>Size
             </td>
 
             <td class="entry_range">
             rounded to nearest larger supportable width,<wbr> especially
             for raw output,<wbr> where only a few fixed scales may be
             possible.<wbr> The width and height of the crop region cannot
-            be set to be smaller than floor( activePixelArray.<wbr>width /<wbr>
+            be set to be smaller than floor( activeArraySize.<wbr>width /<wbr>
             android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom ) and floor(
-            activePixelArray.<wbr>height /<wbr> android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom),<wbr>
+            activeArraySize.<wbr>height /<wbr> android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom),<wbr>
             respectively.<wbr>
           
             </td>
index 1b9b862..6e688aa 100644 (file)
@@ -1520,7 +1520,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           HAL2.x uses only (x, y, width)</description>
           <units>(x,y) of top-left corner, width and height of region
           in pixels; (0,0) is top-left corner of
-          android.sensor.activePixelArray</units>
+          android.sensor.activeArraySize</units>
           <notes>
             Any additional per-stream cropping must be done to
             maximize the final pixel area of the stream.
@@ -1543,9 +1543,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             rounded to nearest larger supportable width, especially
             for raw output, where only a few fixed scales may be
             possible. The width and height of the crop region cannot
-            be set to be smaller than floor( activePixelArray.width /
+            be set to be smaller than floor( activeArraySize.width /
             android.scaler.maxDigitalZoom ) and floor(
-            activePixelArray.height / android.scaler.maxDigitalZoom),
+            activeArraySize.height / android.scaler.maxDigitalZoom),
             respectively.
           </notes>
           <tag id="BC" />