Merge "Camera: Revise crop region definition." into jb-mr2-dev
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index b5ea4d8..49b535b 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -265,7 +265,6 @@
<li><a href="#static_android.scaler.availableProcessedSizes">android.scaler.availableProcessedSizes</a> (static)</li>
<li><a href="#static_android.scaler.availableRawMinDurations">android.scaler.availableRawMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableRawSizes">android.scaler.availableRawSizes</a> (static)</li>
- <li><a href="#static_android.scaler.maxDigitalZoom">android.scaler.maxDigitalZoom</a> (static)</li>
<li><a href="#dynamic_android.scaler.cropRegion">android.scaler.cropRegion</a> (dynamic)</li>
</ul>
</li> <!-- toc_section -->
@@ -2039,8 +2038,13 @@
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Available<wbr>Modes</td>
<td class="entry_type">
<span class="entry_type_name">byte</span>
+ <span class="entry_type_container">x</span>
+ <span class="entry_type_array">
+ n
+ </span>
+ <div class="entry_type_notes">List of enums (android.<wbr>control.<wbr>awb<wbr>Mode)</div>
</td> <!-- entry_type -->
@@ -2049,7 +2053,6 @@
</td>
<td class="entry_units">
- List of enums (android.<wbr>control.<wbr>awb<wbr>Mode)
</td>
<td class="entry_range">
@@ -6927,7 +6930,7 @@
<tr class="entry" id="static_android.scaler.availableMaxDigitalZoom">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Max<wbr>Digital<wbr>Zoom</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">float</span>
@@ -6935,19 +6938,26 @@
</td> <!-- entry_type -->
<td class="entry_description">
- TODO: have a real description here
+ The maximum ratio between active area width
+ and crop region width,<wbr> or between active area height and
+ crop region height,<wbr> if the crop region height is larger
+ than width
</td>
<td class="entry_units">
</td>
<td class="entry_range">
+ >=1
</td>
<td class="entry_notes">
</td>
<td class="entry_tags">
+ <ul class="entry_tags">
+ <li><a href="#tag_BC">BC</a></li>
+ </ul>
</td>
</tr> <!-- end of entry -->
@@ -7115,42 +7125,6 @@
</tr> <!-- end of entry -->
-
- <tr class="entry" id="static_android.scaler.maxDigitalZoom">
- <td class="entry_name">android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom</td>
- <td class="entry_type">
- <span class="entry_type_name">float</span>
-
-
-
-
- </td> <!-- entry_type -->
-
- <td class="entry_description">
- The maximum ratio between active area width
- and crop region width,<wbr> or between active area height and
- crop region height,<wbr> if the crop region height is larger
- than width
- </td>
-
- <td class="entry_units">
- </td>
-
- <td class="entry_range">
- >=1
- </td>
-
- <td class="entry_notes">
- </td>
-
- <td class="entry_tags">
- <ul class="entry_tags">
- <li><a href="#tag_BC">BC</a></li>
- </ul>
- </td>
-
- </tr> <!-- end of entry -->
-
<!-- end of kind -->
@@ -10221,10 +10195,10 @@
<li><a href="#static_android.scaler.availableFormats">android.scaler.availableFormats</a> (static)</li>
<li><a href="#static_android.scaler.availableJpegMinDurations">android.scaler.availableJpegMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableJpegSizes">android.scaler.availableJpegSizes</a> (static)</li>
+ <li><a href="#static_android.scaler.availableMaxDigitalZoom">android.scaler.availableMaxDigitalZoom</a> (static)</li>
<li><a href="#static_android.scaler.availableProcessedMinDurations">android.scaler.availableProcessedMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableProcessedSizes">android.scaler.availableProcessedSizes</a> (static)</li>
<li><a href="#static_android.scaler.availableRawMinDurations">android.scaler.availableRawMinDurations</a> (static)</li>
- <li><a href="#static_android.scaler.maxDigitalZoom">android.scaler.maxDigitalZoom</a> (static)</li>
<li><a href="#controls_android.sensor.frameDuration">android.sensor.frameDuration</a> (controls)</li>
<li><a href="#static_android.sensor.info.availableSensitivities">android.sensor.info.availableSensitivities</a> (static)</li>
<li><a href="#static_android.sensor.info.maxFrameDuration">android.sensor.info.maxFrameDuration</a> (static)</li>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 7d27c36..1b9b862 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -592,8 +592,12 @@
<range>OFF must be included</range>
<tag id="BC" />
</entry>
- <entry name="awbAvailableModes" type="byte">
- <units>List of enums (android.control.awbMode)</units>
+ <entry name="awbAvailableModes" type="byte"
+ type_notes="List of enums (android.control.awbMode)"
+ container="array">
+ <array>
+ <size>n</size>
+ </array>
<range>OFF, AUTO must be included</range>
<tag id="BC" />
</entry>
@@ -1597,8 +1601,13 @@
include: - half/quarter max resolution</range>
<tag id="BC" />
</entry>
- <entry name="availableMaxDigitalZoom" type="int32">
- <description>TODO: have a real description here</description>
+ <entry name="availableMaxDigitalZoom" type="float">
+ <description>The maximum ratio between active area width
+ and crop region width, or between active area height and
+ crop region height, if the crop region height is larger
+ than width</description>
+ <range>>=1</range>
+ <tag id="BC" />
</entry>
<entry name="availableProcessedMinDurations" type="int64"
container="array">
@@ -1655,14 +1664,6 @@
height</description>
<range>Must include: - sensor maximum resolution</range>
</entry>
- <entry name="maxDigitalZoom" type="float">
- <description>The maximum ratio between active area width
- and crop region width, or between active area height and
- crop region height, if the crop region height is larger
- than width</description>
- <range>>=1</range>
- <tag id="BC" />
- </entry>
</static>
<dynamic>
<clone entry="android.scaler.cropRegion" kind="controls">
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 8d5cdf4..729bcd1 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -238,7 +238,6 @@
ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES,
ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS,
ANDROID_SCALER_AVAILABLE_RAW_SIZES,
- ANDROID_SCALER_MAX_DIGITAL_ZOOM,
ANDROID_SCALER_END,
ANDROID_SENSOR_EXPOSURE_TIME = ANDROID_SENSOR_START,
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index c547dfb..a1d303e 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -368,7 +368,7 @@
[ ANDROID_SCALER_AVAILABLE_JPEG_SIZES - ANDROID_SCALER_START ] =
{ "availableJpegSizes", TYPE_INT32 },
[ ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM - ANDROID_SCALER_START ] =
- { "availableMaxDigitalZoom", TYPE_INT32 },
+ { "availableMaxDigitalZoom", TYPE_FLOAT },
[ ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS - ANDROID_SCALER_START ] =
{ "availableProcessedMinDurations",
TYPE_INT64 },
@@ -378,8 +378,6 @@
{ "availableRawMinDurations", TYPE_INT64 },
[ ANDROID_SCALER_AVAILABLE_RAW_SIZES - ANDROID_SCALER_START ] =
{ "availableRawSizes", TYPE_INT32 },
- [ ANDROID_SCALER_MAX_DIGITAL_ZOOM - ANDROID_SCALER_START ] =
- { "maxDigitalZoom", TYPE_FLOAT },
};
static tag_info_t android_sensor[ANDROID_SENSOR_END -
@@ -1489,9 +1487,6 @@
case ANDROID_SCALER_AVAILABLE_RAW_SIZES: {
break;
}
- case ANDROID_SCALER_MAX_DIGITAL_ZOOM: {
- break;
- }
case ANDROID_SENSOR_EXPOSURE_TIME: {
break;
