camera_metadata: Correct stream id type
It was wrongly specified as uint8_t.
Bug: 10604704
Change-Id: I1cbe2862f49135ddc600e9c05c6f1dda6d28070c
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index f1a0e0d..5d1bd4f 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -6609,7 +6609,7 @@
<tr class="entry" id="controls_android.request.inputStreams">
<td class="entry_name">android.<wbr>request.<wbr>input<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6704,7 +6704,7 @@
<tr class="entry" id="controls_android.request.outputStreams">
<td class="entry_name">android.<wbr>request.<wbr>output<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7050,7 +7050,7 @@
<tr class="entry" id="dynamic_android.request.outputStreams">
<td class="entry_name">android.<wbr>request.<wbr>output<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 16c831f..cd07340 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1485,7 +1485,7 @@
<range>Any int</range>
<tag id="V1" />
</entry>
- <entry name="inputStreams" type="byte" visibility="system"
+ <entry name="inputStreams" type="int32" visibility="system"
container="array">
<array>
<size>n</size>
@@ -1523,7 +1523,7 @@
<description>How much metadata to produce on
output</description>
</entry>
- <entry name="outputStreams" type="byte" visibility="system"
+ <entry name="outputStreams" type="int32" visibility="system"
container="array">
<array>
<size>n</size>
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 7adba8c..ab92dd1 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -238,9 +238,9 @@
ANDROID_REQUEST_FRAME_COUNT = // int32 | public
ANDROID_REQUEST_START,
ANDROID_REQUEST_ID, // int32 | hidden
- ANDROID_REQUEST_INPUT_STREAMS, // byte[] | system
+ ANDROID_REQUEST_INPUT_STREAMS, // int32[] | system
ANDROID_REQUEST_METADATA_MODE, // enum | system
- ANDROID_REQUEST_OUTPUT_STREAMS, // byte[] | system
+ ANDROID_REQUEST_OUTPUT_STREAMS, // int32[] | system
ANDROID_REQUEST_TYPE, // enum | system
ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS, // int32[] | public
ANDROID_REQUEST_MAX_NUM_REPROCESS_STREAMS, // int32[] | system
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index d9c7316..80fe3ce 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -351,11 +351,11 @@
[ ANDROID_REQUEST_ID - ANDROID_REQUEST_START ] =
{ "id", TYPE_INT32 },
[ ANDROID_REQUEST_INPUT_STREAMS - ANDROID_REQUEST_START ] =
- { "inputStreams", TYPE_BYTE },
+ { "inputStreams", TYPE_INT32 },
[ ANDROID_REQUEST_METADATA_MODE - ANDROID_REQUEST_START ] =
{ "metadataMode", TYPE_BYTE },
[ ANDROID_REQUEST_OUTPUT_STREAMS - ANDROID_REQUEST_START ] =
- { "outputStreams", TYPE_BYTE },
+ { "outputStreams", TYPE_INT32 },
[ ANDROID_REQUEST_TYPE - ANDROID_REQUEST_START ] =
{ "type", TYPE_BYTE },
[ ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS - ANDROID_REQUEST_START ] =