Merge "camera3: Remove noiseModelCoefficients."
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index c9595d2..a62f56d 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -501,7 +501,6 @@
<li><a href="#static_android.sensor.baseGainFactor">android.sensor.baseGainFactor</a></li>
<li><a href="#static_android.sensor.blackLevelPattern">android.sensor.blackLevelPattern</a></li>
<li><a href="#static_android.sensor.maxAnalogSensitivity">android.sensor.maxAnalogSensitivity</a></li>
- <li><a href="#static_android.sensor.noiseModelCoefficients">android.sensor.noiseModelCoefficients</a></li>
<li><a href="#static_android.sensor.orientation">android.sensor.orientation</a></li>
<li><a href="#static_android.sensor.profileHueSatMapDimensions">android.sensor.profileHueSatMapDimensions</a></li>
<li><a href="#static_android.sensor.availableTestPatternModes">android.sensor.availableTestPatternModes</a></li>
@@ -12483,62 +12482,6 @@
<!-- end of entry -->
- <tr class="entry" id="static_android.sensor.noiseModelCoefficients">
- <td class="entry_name" rowspan="3">
- android.<wbr/>sensor.<wbr/>noise<wbr/>Model<wbr/>Coefficients
- </td>
- <td class="entry_type">
- <span class="entry_type_name">float</span>
- <span class="entry_type_container">x</span>
-
- <span class="entry_type_array">
- 2
- </span>
- <span class="entry_type_visibility"> [system]</span>
- <div class="entry_type_notes">float constants A,<wbr/> B for the noise variance model</div>
-
-
- </td> <!-- entry_type -->
-
- <td class="entry_description">
- <p>Estimation of sensor noise
-characteristics</p>
- </td>
-
- <td class="entry_units">
- var(raw pixel value) = electrons * (baseGainFactor
- * iso/<wbr/>100)^2 + A * (baseGainFactor * iso/<wbr/>100)^2 +
- B
- </td>
-
- <td class="entry_range">
- </td>
-
- <td class="entry_tags">
- <ul class="entry_tags">
- <li><a href="#tag_V1">V1</a></li>
- </ul>
- </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>A represents sensor read noise before analog
-amplification; B represents noise from A/<wbr/>D conversion and
-other circuits after amplification.<wbr/> Both noise sources
-are assumed to be gaussian,<wbr/> independent,<wbr/> and not to vary
-across the sensor</p>
- </td>
- </tr>
-
-
- <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
- <!-- end of entry -->
-
-
<tr class="entry" id="static_android.sensor.orientation">
<td class="entry_name" rowspan="1">
android.<wbr/>sensor.<wbr/>orientation
@@ -16760,7 +16703,6 @@
<li><a href="#static_android.sensor.info.physicalSize">android.sensor.info.physicalSize</a> (static)</li>
<li><a href="#static_android.sensor.baseGainFactor">android.sensor.baseGainFactor</a> (static)</li>
<li><a href="#static_android.sensor.maxAnalogSensitivity">android.sensor.maxAnalogSensitivity</a> (static)</li>
- <li><a href="#static_android.sensor.noiseModelCoefficients">android.sensor.noiseModelCoefficients</a> (static)</li>
<li><a href="#controls_android.statistics.histogramMode">android.statistics.histogramMode</a> (controls)</li>
<li><a href="#controls_android.statistics.sharpnessMapMode">android.statistics.sharpnessMapMode</a> (controls)</li>
<li><a href="#dynamic_android.statistics.histogram">android.statistics.histogram</a> (dynamic)</li>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 0ac5525..486caf4 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -3874,24 +3874,6 @@
<tag id="V1" />
<tag id="FULL" />
</entry>
- <entry name="noiseModelCoefficients" type="float"
- type_notes="float constants A, B for the noise variance model"
- container="array">
- <array>
- <size>2</size>
- </array>
- <description>Estimation of sensor noise
- characteristics</description>
- <units>var(raw pixel value) = electrons * (baseGainFactor
- * iso/100)^2 + A * (baseGainFactor * iso/100)^2 +
- B</units>
- <details>A represents sensor read noise before analog
- amplification; B represents noise from A/D conversion and
- other circuits after amplification. Both noise sources
- are assumed to be gaussian, independent, and not to vary
- across the sensor</details>
- <tag id="V1" />
- </entry>
<entry name="orientation" type="int32" visibility="public">
<description>Clockwise angle through which the output
image needs to be rotated to be upright on the device
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index a54bd5a..aad5349 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -277,7 +277,6 @@
ANDROID_SENSOR_BASE_GAIN_FACTOR, // rational | public
ANDROID_SENSOR_BLACK_LEVEL_PATTERN, // int32[] | public
ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY, // int32 | public
- ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS, // float[] | system
ANDROID_SENSOR_ORIENTATION, // int32 | public
ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS, // int32[] | public
ANDROID_SENSOR_TIMESTAMP, // int64 | public
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 2da7b8d..b460129 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -429,8 +429,6 @@
{ "blackLevelPattern", TYPE_INT32 },
[ ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY - ANDROID_SENSOR_START ] =
{ "maxAnalogSensitivity", TYPE_INT32 },
- [ ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS - ANDROID_SENSOR_START ] =
- { "noiseModelCoefficients", TYPE_FLOAT },
[ ANDROID_SENSOR_ORIENTATION - ANDROID_SENSOR_START ] =
{ "orientation", TYPE_INT32 },
[ ANDROID_SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS - ANDROID_SENSOR_START ] =
@@ -1727,9 +1725,6 @@
case ANDROID_SENSOR_MAX_ANALOG_SENSITIVITY: {
break;
}
- case ANDROID_SENSOR_NOISE_MODEL_COEFFICIENTS: {
- break;
- }
case ANDROID_SENSOR_ORIENTATION: {
break;
}