summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-05-03Metadata: Add audio_metadata_byte_string_len.Andy Hung3-1/+80
Used to compute the length of the metadata byte string from a pointer to the raw byte string buffer, as strlen() does not work due to embedded zeroes. Test: atest metadata_tests Bug: 186894288 Change-Id: I441bcaf7d2525a273edccc3693ce16b8a623b0ee
2021-05-01Snap for 7328689 from 25d6ce6f06c7fff251bc50b8a64508b58e407600 to sc-releaseandroid-build-team Robot4-1/+155
Change-Id: I20348fc2699e6e516ae795bddc73f1cf44cd01be
2021-04-30[automerger skipped] Merge changes from topics "dra", "dts_uhd", "earc" am: ↵Andy Hung0-0/+0
aeb2d23b54 am: 9e84207905 am: 26ef364400 -s ours am skip reason: Merged-In Iaada3df7b31bb7327ee50b85cf1553b0fb2bfc2e with SHA-1 e61b9395fe is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690658 Change-Id: I945a969fa61c40450d3e04ccd5dfc4fe4ab32ff9
2021-04-30[automerger skipped] audio: add device constants for HDMI EARC am: ↵Kuowei Li0-0/+0
dc1d3533a2 am: f79c3b770b am: ed1bb32e1d -s ours am skip reason: Merged-In I4d84c8cc25dffdfced32f17411b65d1db4b09dbb with SHA-1 4b0fb7272b is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690657 Change-Id: Ic1a8331a131f31962b8559c710d3cc98b8aa60ec
2021-04-30[automerger skipped] Audio: Add AUDIO_FORMAT_DTS_UHD am: dbbd7f29a2 am: ↵Andy Hung0-0/+0
f457efb9d2 am: 00296f5aaa -s ours am skip reason: Merged-In Ia057d3b61ca4c4bec7ead3597b1ffa8c45f877d5 with SHA-1 bd4a9155a3 is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692092 Change-Id: Ie47375cf3bb76522d4d52e028060e645840c6df2
2021-04-30Merge changes from topics "dra", "dts_uhd", "earc" am: aeb2d23b54 am: 9e84207905Andy Hung2-1/+3
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690658 Change-Id: Ie952d1adadc9e9f1e7a2ff125d0c4d2239cd7fdf
2021-04-30audio: add device constants for HDMI EARC am: dc1d3533a2 am: f79c3b770bKuowei Li2-0/+8
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690657 Change-Id: I7307592e0accbbb7d9851f4a9a3882c3fb0caa04
2021-04-30Audio: Add AUDIO_FORMAT_DTS_UHD am: dbbd7f29a2 am: f457efb9d2Andy Hung2-1/+4
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692092 Change-Id: I3a3dd3f81cd00996f55b59455648a26a1792409b
2021-04-30Merge changes from topics "dra", "dts_uhd", "earc" am: aeb2d23b54Andy Hung2-1/+3
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690658 Change-Id: I54f4ae379df51ff760a7d864afcd2650d658d5b0
2021-04-30audio: add device constants for HDMI EARC am: dc1d3533a2Kuowei Li2-0/+8
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1690657 Change-Id: I40b7451ef081abc6d2495bb93483197f8bcf61df
2021-04-30Audio: Add AUDIO_FORMAT_DTS_UHD am: dbbd7f29a2Andy Hung2-1/+4
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1692092 Change-Id: I87ef43ab5873abbc9cc79eecff050acec1dd4327
2021-04-30Merge changes from topics "dra", "dts_uhd", "earc"Andy Hung3-1/+14
* changes: Audio: Add AUDIO_FORMAT_DRA audio: add device constants for HDMI EARC Audio: Add AUDIO_FORMAT_DTS_UHD
2021-04-30Camera: Require activePhysicalId for multi-res inputShuzhen Wang2-1/+22
To better support multi-resolution reprocessing, require the HAL to pass the physical camera Id in activePhysicalCamera tag. The purpose is for the HAL to know which physical camera the reprocessing comes from. Test: Camera CTS Bug: 183529263 Change-Id: Id789360ce9eaa33d76341492f5ae4cd505f9a3f8
2021-04-29Audio: Add AUDIO_FORMAT_DRAAndy Hung2-1/+3
China DTMB digital TV. See SJ/T11368-2006 “Specification for multichannel digital audio coding technology”. Test: atest AudioFormatTest Bug: 185950819 Merged-In: Iaada3df7b31bb7327ee50b85cf1553b0fb2bfc2e Change-Id: Iaada3df7b31bb7327ee50b85cf1553b0fb2bfc2e
2021-04-29audio: add device constants for HDMI EARCKuowei Li2-0/+8
Implementation check by grep -E -r "HDMI_ARC|HDMI_EARC" . Test: atest AudioDeviceInfoTest Bug: 131385398 Bug: 151781316 Merged-In: I4d84c8cc25dffdfced32f17411b65d1db4b09dbb Change-Id: I4d84c8cc25dffdfced32f17411b65d1db4b09dbb
2021-04-29Audio: Add AUDIO_FORMAT_DTS_UHDAndy Hung2-1/+4
See ETSI TS 103 491 V1.2.1 (2019-05) DTS-UHD Audio Format; Delivery of Channels, Objects and Ambisonic Sound Fields Test: atest AudioFormatTest Bug: 184538197 Merged-In: Ia057d3b61ca4c4bec7ead3597b1ffa8c45f877d5 Change-Id: Ia057d3b61ca4c4bec7ead3597b1ffa8c45f877d5
2021-04-29Merge "Added fuzzer for fifo audio utils read and write" am: bdbb147b86 am: ↵Cory Barker2-0/+133
de03ca5d6c am: cf4e4a4d93 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1682748 Change-Id: Iee900344dfc642214e2d7262c520a734fdec026b
2021-04-29Merge "Added fuzzer for fifo audio utils read and write" am: bdbb147b86 am: ↵Cory Barker2-0/+133
de03ca5d6c Original change: https://android-review.googlesource.com/c/platform/system/media/+/1682748 Change-Id: Ic5383f3980294392afb5eb88b0c1e6062cc9604e
2021-04-29Merge "Added fuzzer for fifo audio utils read and write" am: bdbb147b86Cory Barker2-0/+133
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1682748 Change-Id: I9025f7be4001e3ff2d4f1ffd554d5c064845ad60
2021-04-29Merge "Added fuzzer for fifo audio utils read and write"Cory Barker2-0/+133
2021-04-28Added fuzzer for fifo audio utils read and writeCory Barker2-0/+133
Test: manual testing on host and device Change-Id: I15fd75575cc0b7910b15b1f5d30c2667702b2399
2021-04-24Snap for 7310088 from 618b55cf9ea846536964b250d4af8eed78304660 to sc-releaseandroid-build-team Robot5-63/+309
Change-Id: I4e39971bd4c103b983ee3f03e13713abdcf1547e
2021-04-23Merge "Revert "Revert "audio_route: add support to parse array of integer ↵Eric Laurent1-25/+39
type""" into sc-dev
2021-04-23Merge "Camera: Update camera API spec for min 1080p JPEG size" into sc-devTreeHugger Robot2-4/+91
2021-04-23Merge "Camera: Add new metadata tag for multiResolution capability" into sc-devTreeHugger Robot4-34/+179
2021-04-23Snap for 7306623 from e61b9395fed9feb50e1a78c15eb60a74ca930787 to sc-releaseandroid-build-team Robot2-1/+3
Change-Id: I8697f7ad0a99f8842aa88c7acd1521811f9b639c
2021-04-20Audio: Add AUDIO_FORMAT_DRAAndy Hung2-1/+3
China DTMB digital TV. See SJ/T11368-2006 “Specification for multichannel digital audio coding technology”. Test: atest AudioFormatTest Bug: 185950819 Change-Id: Iaada3df7b31bb7327ee50b85cf1553b0fb2bfc2e
2021-04-20Camera: Update camera API spec for min 1080p JPEG sizeShuzhen Wang2-4/+91
From Android 12, allow the HAL to not advertise JPEG sizes smaller than 1080p. Test: Camera CTS Bug: 184687664 Change-Id: I1a58a765a144e2c7e3084b1649888ba813489b5f
2021-04-20Camera: Add new metadata tag for multiResolution capabilityShuzhen Wang4-34/+179
This avoids the ambiguity of deriving multi-resolution stream configuration map when a physical camera backs more than one logical camera. For example, if a logical camera L0 is backed by physical camera 3 (P3) and physical camera 4 (P4), where both P3 and P4 advertise physical multi-resolution stream configuration map. However, P4 may be backing a different logical camera L2 with P5, which doesn't advertise physical multi-resolution stream configuration map. In that case, it's not clear whether L2 should support multi-resolution streams. Adding a dedicated tag to indicate multi-resolution stream support solves this ambiguity. Test: Camera VTS and CTS Bug: 184663916 Change-Id: If5998f8fca67f64c4403fc22e345e9e669a2cc38
2021-04-19Revert "Revert "audio_route: add support to parse array of integer type""Eric Laurent1-25/+39
This reverts commit 316583e1dc75d30c66ef74f1ed3ca00cbed5274e and fixes state level update in start_tag() in case or byte or int array parsing error. Bug: 185443843 Bug: 179283740 Test: Audio smoke tests on sargo. Change-Id: I6524c270cb16c31d3eeb424358df6a0605642de6
2021-04-17Snap for 7292112 from 8b4db0ce3851bc1c857b3f3942b65b2df74bd169 to sc-releaseandroid-build-team Robot3-2/+88
Change-Id: I6cc25bca2c5f32bf02b4d0508fcc1eba3afd5c40
2021-04-17Merge changes from topics "24ch Audio HAL", "360RA HAL" am: e7424e0fd1 am: ↵Andy Hung3-2/+76
2d57c30196 am: 69e8e354d4 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1677034 Change-Id: I0f49d1a671af009084591fe70854e46052f773d1
2021-04-17audio: Add 13ch audio support for 360 Reality Audio am: ce7dee77c8 am: ↵Kei Murayama1-0/+12
d0c8e78fd0 am: 8d41ccad67 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1669586 Change-Id: I3a67eaf3f64c976ccd806a0df5b59dd4da3739f0
2021-04-17Merge changes from topics "24ch Audio HAL", "360RA HAL" am: e7424e0fd1 am: ↵Andy Hung3-2/+76
2d57c30196 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1677034 Change-Id: If774b606dd9dd72a99750c88033c4df647386afa
2021-04-17audio: Add 13ch audio support for 360 Reality Audio am: ce7dee77c8 am: ↵Kei Murayama1-0/+12
d0c8e78fd0 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1669586 Change-Id: Ieee33ddb77199edec41c75c3064ba48da7e9f6b8
2021-04-17Merge changes from topics "24ch Audio HAL", "360RA HAL" am: e7424e0fd1Andy Hung3-2/+76
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1677034 Change-Id: Id6eca85423ce5842dd1debb240425ff34403596d
2021-04-17audio: Add 13ch audio support for 360 Reality Audio am: ce7dee77c8Kei Murayama1-0/+12
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1669586 Change-Id: I2e61be03455f00a07221158714ba96ee4e85f937
2021-04-17Merge changes from topics "24ch Audio HAL", "360RA HAL"Andy Hung3-2/+88
* changes: audio: Add 24ch audio support for 3d immersive audio audio: Add 13ch audio support for 360 Reality Audio
2021-04-16audio: Add 24ch audio support for 3d immersive audioAndy Hung3-2/+76
Add AUDIO_CHANNEL_OUT_22POINT2. Add AUDIO_CHANNEL_OUT_LOW_FREQUENCY_2. Set AUDIO_CHANNEL_OUT_7POINT1POINT4 and AUDIO_CHANNEL_OUT_22POINT2 as canonical formats. Test: added static_assert popcount tests, compiles Bug: 185530406 Change-Id: I551dfb8d139bc4c532490d1e88b557c9e588726e
2021-04-16Snap for 7286185 from 87d7d95bbec68d13d79f10f9cff59486687cc84f to sc-releaseandroid-build-team Robot1-1/+1
Change-Id: I109caf9eb790ad692ca42424c8ba595fa1339423
2021-04-15audio: Add 13ch audio support for 360 Reality AudioKei Murayama1-0/+12
- Add definitions for the front bottom channels. - Add definition for 13ch mask which uses surround 5 channels, top 5 channels and bottom 3ch channels. Bug: 185100731 Test: Play wav with 13ch mask after OUT_CHANNEL_COUNT_MAX to 24 Change-Id: I2a620fb1175c6576bead7878315fc48ff5171ddf
2021-04-15Merge cherrypicks of [14200623, 14200667, 14200697] into sc-releaseandroid-build-team Robot1-40/+25
Change-Id: I4dca1bfb03d6bb94d7dcc7d7b1da4c58e75b18df
2021-04-15Revert "audio_route: add support to parse array of integer type"Eric Laurent1-40/+25
This reverts commit 3eef63ce10ecd4fb5b0301a1e4cf55353b94dcba. Reason for revert: b/185443843 Change-Id: Ic5e7e003a7ea575f6e2760e02f354b77666adcaf (cherry picked from commit 316583e1dc75d30c66ef74f1ed3ca00cbed5274e)
2021-04-15Merge "Revert "audio_route: add support to parse array of integer type"" ↵Eric Laurent1-40/+25
into sc-dev
2021-04-15Revert "audio_route: add support to parse array of integer type"Eric Laurent1-40/+25
This reverts commit 3eef63ce10ecd4fb5b0301a1e4cf55353b94dcba. Reason for revert: b/185443843 Change-Id: Ic5e7e003a7ea575f6e2760e02f354b77666adcaf
2021-04-15Snap for 7283897 from 3eef63ce10ecd4fb5b0301a1e4cf55353b94dcba to sc-releaseandroid-build-team Robot1-25/+40
Change-Id: I481c5eac1f236d5d9b53f7609e98cfa732d5402c
2021-04-14Merge "Camera: Fix broken ndk link for synthetic extendedSceneMode keys" ↵Shuzhen Wang1-1/+1
into sc-dev
2021-04-14Camera: Fix broken ndk link for synthetic extendedSceneMode keysShuzhen Wang1-1/+1
Ndk doesn't see synthetic keys. Use the ndk specific keys instead. Test: Build Bug: 185383088 Change-Id: Ia725df953d3bdeece216191b5a283fe73b0f42c9
2021-04-14audio_route: add support to parse array of integer typeJaideep Sharma1-25/+40
Add support to parse integer array in mixer path xml. Test: audio smoke tests for both playback and recording Bug: 179283740 authored-by: Zhou Song <zhous@codeaurora.org> Change-Id: I0b99dda8aa000f946e6eb05e513b1ca0ee804900
2021-04-14Snap for 7280565 from 4c9ba74d8af368e6273d38804010c203a04003e1 to sc-releaseandroid-build-team Robot2-0/+8
Change-Id: I94be51f35e8f176eb37899e1e926e4fc9ca1f850