diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-09 18:27:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-09 18:27:34 +0000 |
| commit | f0771b27ac2a6deaf81afdf318580d0ae57e9de1 (patch) | |
| tree | d67d97f4ed3ee5bbda0ffc9b3392632c624ae9a6 | |
| parent | 44a1422b9b923cac65bdf8dded0bc66b17cfb546 (diff) | |
| parent | e36cdbe76abf3798a148cb11a90bd78abb50af65 (diff) | |
| download | android_system_media-f0771b27ac2a6deaf81afdf318580d0ae57e9de1.tar.gz android_system_media-f0771b27ac2a6deaf81afdf318580d0ae57e9de1.tar.bz2 android_system_media-f0771b27ac2a6deaf81afdf318580d0ae57e9de1.zip | |
Merge "camera_metadata: Correct stream id type" into klp-dev
| -rw-r--r-- | camera/docs/docs.html | 6 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 4 | ||||
| -rw-r--r-- | camera/include/system/camera_metadata_tags.h | 4 | ||||
| -rw-r--r-- | camera/src/camera_metadata_tag_info.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index b06967a5..8b1b233e 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 1cc9e3e0..a14576bc 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -1485,7 +1485,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <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 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <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 7adba8cb..ab92dd14 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -238,9 +238,9 @@ typedef enum camera_metadata_tag { 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 d9c7316e..80fe3ce1 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -351,11 +351,11 @@ static tag_info_t android_request[ANDROID_REQUEST_END - [ 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 ] = |