merge in mnc-dr-release history after reset to mnc-dr-dev
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 495ea6e..4825c6b 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -12263,7 +12263,7 @@
<td class="entry_units">
- Quarternion coefficients
+ Quaternion coefficients
</td>
@@ -12282,13 +12282,13 @@
</tr>
<tr class="entry_cont">
<td class="entry_details" colspan="5">
- <p>The four coefficients that describe the quarternion
+ <p>The four coefficients that describe the quaternion
rotation from the Android sensor coordinate system to a
camera-aligned coordinate system where the X-axis is
aligned with the long side of the image sensor,<wbr/> the Y-axis
is aligned with the short side of the image sensor,<wbr/> and
the Z-axis is aligned with the optical axis of the sensor.<wbr/></p>
-<p>To convert from the quarternion coefficients <code>(x,<wbr/>y,<wbr/>z,<wbr/>w)</code>
+<p>To convert from the quaternion coefficients <code>(x,<wbr/>y,<wbr/>z,<wbr/>w)</code>
to the axis of rotation <code>(a_<wbr/>x,<wbr/> a_<wbr/>y,<wbr/> a_<wbr/>z)</code> and rotation
amount <code>theta</code>,<wbr/> the following formulas can be used:</p>
<pre><code> theta = 2 * acos(w)
@@ -12297,7 +12297,7 @@
a_<wbr/>z = z /<wbr/> sin(theta/<wbr/>2)
</code></pre>
<p>To create a 3x3 rotation matrix that applies the rotation
-defined by this quarternion,<wbr/> the following matrix can be
+defined by this quaternion,<wbr/> the following matrix can be
used:</p>
<pre><code>R = [ 1 - 2y^2 - 2z^2,<wbr/> 2xy - 2zw,<wbr/> 2xz + 2yw,<wbr/>
2xy + 2zw,<wbr/> 1 - 2x^2 - 2z^2,<wbr/> 2yz - 2xw,<wbr/>
@@ -12373,13 +12373,13 @@
user's perspective) will report <code>(0.<wbr/>03,<wbr/> 0,<wbr/> 0)</code>.<wbr/></p>
<p>To transform a pixel coordinates between two cameras
facing the same direction,<wbr/> first the source camera
-<a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a> must be corrected for.<wbr/> Then
-the source camera <a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> needs
+<a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a> must be corrected for.<wbr/> Then
+the source camera <a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> needs
to be applied,<wbr/> followed by the <a href="#static_android.lens.poseRotation">android.<wbr/>lens.<wbr/>pose<wbr/>Rotation</a>
of the source camera,<wbr/> the translation of the source camera
relative to the destination camera,<wbr/> the
<a href="#static_android.lens.poseRotation">android.<wbr/>lens.<wbr/>pose<wbr/>Rotation</a> of the destination camera,<wbr/> and
-finally the inverse of <a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a>
+finally the inverse of <a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a>
of the destination camera.<wbr/> This obtains a
radial-distortion-free coordinate in the destination
camera pixel coordinates.<wbr/></p>
@@ -12481,7 +12481,7 @@
where <code>(0,<wbr/>0)</code> is the top-left of the
preCorrectionActiveArraySize rectangle.<wbr/> Once the pose and
intrinsic calibration transforms have been applied to a
-world point,<wbr/> then the <a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>
+world point,<wbr/> then the <a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>
transform needs to be applied,<wbr/> and the result adjusted to
be in the <a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> coordinate
system (where <code>(0,<wbr/> 0)</code> is the top-left of the
@@ -12559,7 +12559,7 @@
</code></pre>
<p>The pixel coordinates are defined in a normalized
coordinate system related to the
-<a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> calibration fields.<wbr/>
+<a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> calibration fields.<wbr/>
Both <code>[x_<wbr/>i,<wbr/> y_<wbr/>i]</code> and <code>[x_<wbr/>c,<wbr/> y_<wbr/>c]</code> have <code>(0,<wbr/>0)</code> at the
lens optical center <code>[c_<wbr/>x,<wbr/> c_<wbr/>y]</code>.<wbr/> The maximum magnitudes
of both x and y coordinates are normalized to be 1 at the
@@ -13088,7 +13088,7 @@
<td class="entry_units">
- Quarternion coefficients
+ Quaternion coefficients
</td>
@@ -13107,13 +13107,13 @@
</tr>
<tr class="entry_cont">
<td class="entry_details" colspan="5">
- <p>The four coefficients that describe the quarternion
+ <p>The four coefficients that describe the quaternion
rotation from the Android sensor coordinate system to a
camera-aligned coordinate system where the X-axis is
aligned with the long side of the image sensor,<wbr/> the Y-axis
is aligned with the short side of the image sensor,<wbr/> and
the Z-axis is aligned with the optical axis of the sensor.<wbr/></p>
-<p>To convert from the quarternion coefficients <code>(x,<wbr/>y,<wbr/>z,<wbr/>w)</code>
+<p>To convert from the quaternion coefficients <code>(x,<wbr/>y,<wbr/>z,<wbr/>w)</code>
to the axis of rotation <code>(a_<wbr/>x,<wbr/> a_<wbr/>y,<wbr/> a_<wbr/>z)</code> and rotation
amount <code>theta</code>,<wbr/> the following formulas can be used:</p>
<pre><code> theta = 2 * acos(w)
@@ -13122,7 +13122,7 @@
a_<wbr/>z = z /<wbr/> sin(theta/<wbr/>2)
</code></pre>
<p>To create a 3x3 rotation matrix that applies the rotation
-defined by this quarternion,<wbr/> the following matrix can be
+defined by this quaternion,<wbr/> the following matrix can be
used:</p>
<pre><code>R = [ 1 - 2y^2 - 2z^2,<wbr/> 2xy - 2zw,<wbr/> 2xz + 2yw,<wbr/>
2xy + 2zw,<wbr/> 1 - 2x^2 - 2z^2,<wbr/> 2yz - 2xw,<wbr/>
@@ -13198,13 +13198,13 @@
user's perspective) will report <code>(0.<wbr/>03,<wbr/> 0,<wbr/> 0)</code>.<wbr/></p>
<p>To transform a pixel coordinates between two cameras
facing the same direction,<wbr/> first the source camera
-<a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a> must be corrected for.<wbr/> Then
-the source camera <a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> needs
+<a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a> must be corrected for.<wbr/> Then
+the source camera <a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> needs
to be applied,<wbr/> followed by the <a href="#static_android.lens.poseRotation">android.<wbr/>lens.<wbr/>pose<wbr/>Rotation</a>
of the source camera,<wbr/> the translation of the source camera
relative to the destination camera,<wbr/> the
<a href="#static_android.lens.poseRotation">android.<wbr/>lens.<wbr/>pose<wbr/>Rotation</a> of the destination camera,<wbr/> and
-finally the inverse of <a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a>
+finally the inverse of <a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a>
of the destination camera.<wbr/> This obtains a
radial-distortion-free coordinate in the destination
camera pixel coordinates.<wbr/></p>
@@ -13306,7 +13306,7 @@
where <code>(0,<wbr/>0)</code> is the top-left of the
preCorrectionActiveArraySize rectangle.<wbr/> Once the pose and
intrinsic calibration transforms have been applied to a
-world point,<wbr/> then the <a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>
+world point,<wbr/> then the <a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>
transform needs to be applied,<wbr/> and the result adjusted to
be in the <a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> coordinate
system (where <code>(0,<wbr/> 0)</code> is the top-left of the
@@ -13384,7 +13384,7 @@
</code></pre>
<p>The pixel coordinates are defined in a normalized
coordinate system related to the
-<a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> calibration fields.<wbr/>
+<a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a> calibration fields.<wbr/>
Both <code>[x_<wbr/>i,<wbr/> y_<wbr/>i]</code> and <code>[x_<wbr/>c,<wbr/> y_<wbr/>c]</code> have <code>(0,<wbr/>0)</code> at the
lens optical center <code>[c_<wbr/>x,<wbr/> c_<wbr/>y]</code>.<wbr/> The maximum magnitudes
of both x and y coordinates are normalized to be 1 at the
@@ -15431,8 +15431,8 @@
<a href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html">CaptureResult</a>:<ul>
<li><a href="#static_android.lens.poseTranslation">android.<wbr/>lens.<wbr/>pose<wbr/>Translation</a></li>
<li><a href="#static_android.lens.poseRotation">android.<wbr/>lens.<wbr/>pose<wbr/>Rotation</a></li>
-<li><a href="#dynamic_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a></li>
-<li><a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a></li>
+<li><a href="#static_android.lens.intrinsicCalibration">android.<wbr/>lens.<wbr/>intrinsic<wbr/>Calibration</a></li>
+<li><a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a></li>
</ul>
</li>
<li>The <a href="#static_android.depth.depthIsExclusive">android.<wbr/>depth.<wbr/>depth<wbr/>Is<wbr/>Exclusive</a> entry is listed by this device.<wbr/></li>
@@ -19133,7 +19133,7 @@
<a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a>.<wbr/></p>
<p>The currently supported fields that correct for geometric distortion are:</p>
<ol>
-<li><a href="#dynamic_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>.<wbr/></li>
+<li><a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a>.<wbr/></li>
</ol>
<p>If all of the geometric distortion fields are no-ops,<wbr/> this rectangle will be the same
as the post-distortion-corrected rectangle given in
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index dae74e1..612fd4f 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -3599,17 +3599,17 @@
coordinate system.
</description>
<units>
- Quarternion coefficients
+ Quaternion coefficients
</units>
<details>
- The four coefficients that describe the quarternion
+ The four coefficients that describe the quaternion
rotation from the Android sensor coordinate system to a
camera-aligned coordinate system where the X-axis is
aligned with the long side of the image sensor, the Y-axis
is aligned with the short side of the image sensor, and
the Z-axis is aligned with the optical axis of the sensor.
- To convert from the quarternion coefficients `(x,y,z,w)`
+ To convert from the quaternion coefficients `(x,y,z,w)`
to the axis of rotation `(a_x, a_y, a_z)` and rotation
amount `theta`, the following formulas can be used:
@@ -3619,7 +3619,7 @@
a_z = z / sin(theta/2)
To create a 3x3 rotation matrix that applies the rotation
- defined by this quarternion, the following matrix can be
+ defined by this quaternion, the following matrix can be
used:
R = [ 1 - 2y^2 - 2z^2, 2xy - 2zw, 2xz + 2yw,
@@ -3759,10 +3759,6 @@
</clone>
<clone entry="android.lens.poseTranslation" kind="static">
</clone>
- <clone entry="android.lens.intrinsicCalibration" kind="static">
- </clone>
- <clone entry="android.lens.radialDistortion" kind="static">
- </clone>
</dynamic>
<static>
<entry name="intrinsicCalibration" type="float" visibility="public"
@@ -3880,6 +3876,12 @@
<tag id="DEPTH" />
</entry>
</static>
+ <dynamic>
+ <clone entry="android.lens.intrinsicCalibration" kind="static">
+ </clone>
+ <clone entry="android.lens.radialDistortion" kind="static">
+ </clone>
+ </dynamic>
</section>
<section name="noiseReduction">
<controls>
