summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-03-18Merge "Add media to hwasan-postsubmit"aosp-new/masterFlorian Mayer1-0/+8
2022-03-18Add media to hwasan-postsubmitFlorian Mayer1-0/+8
Test: Run tests under HWASan. Bug: 193568145 Change-Id: I2c92b3aa1f629fa8f744b363c2c29c4890ec37ff
2022-03-08Merge "Merge Android 12L"Xin Li20-22/+1266
2022-03-08Merge Android 12LXin Li20-22/+1266
Bug: 222710654 Merged-In: I5929c021e25cfda8574e9691b267733d598ddc09 Change-Id: I3f270cc82ae4d37562fc7bc435becf0deda59ff9
2022-02-15Merge "Generate constants from the audio HAL V7.1 enums" am: dfef7cffeaTreehugger Robot3-67/+106
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1984174 Change-Id: I5929c021e25cfda8574e9691b267733d598ddc09
2022-02-15Merge "Generate constants from the audio HAL V7.1 enums"Treehugger Robot3-67/+106
2022-02-14Generate constants from the audio HAL V7.1 enumsMikhail Naganov3-67/+106
Since hidl-gen does not merge constants from minor uprevs, use two files and add a header file for merging them. Bug: 214426419 Test: m Change-Id: I8226ba55cad6b32f21875e44c4e4fce8dfc55e26
2022-02-14Merge changes from topic "upstream-hal-v7_1-p4" am: 3c853f0bf2Mikhail Naganov1-2/+2
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1982734 Change-Id: I5d65376886c76d15e9274aedb3cafbd2587e8758
2022-02-14[automerger skipped] Audio masks for "front wide" channels am: c283cddef5 -s ↵Jean-Michel Trivi0-0/+0
ours am skip reason: Merged-In Ib953892221d0d278bd29b3d3fd9bb92a79f3426d with SHA-1 d73ed7e9d3 is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1982733 Change-Id: I00f002ec934fca26d8cdf9079f9fd518af00c733
2022-02-14A follow-up to Ultrasound flags addition am: 71395e9ff1Mikhail Naganov1-0/+1
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1982732 Change-Id: Ie0da382e9e4057e5805f1053337ac70f801ac4dc
2022-02-14audio: add flags and input source for Ultrasound am: bfbc68be1cCarter Hsu2-11/+16
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1864494 Change-Id: Iaafb2709163d7e02d831086877cb8d832bed5a41
2022-02-14Merge changes from topic "upstream-hal-v7_1-p4"Mikhail Naganov4-20/+40
* changes: Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALs Audio masks for "front wide" channels A follow-up to Ultrasound flags addition audio: add flags and input source for Ultrasound
2022-02-11Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALsMikhail Naganov1-2/+2
This aligns the list of usages between the framework and HALs Bug: 199193042 Test: m Change-Id: I43796c3671dabf64d59161c8a1463c45ad7e036b (cherry picked from commit 5f0198f99c8fe28f4868d424cf5e859e552da91b) Merged-In: I43796c3671dabf64d59161c8a1463c45ad7e036b
2022-02-11Audio masks for "front wide" channelsJean-Michel Trivi3-7/+21
Add "front wide" left/right channels to support immersive audio configurations such as 9.1.6 Add definitions for configurations 9.1.x that take advantage of front wides. Bug: 188502620 Test: atest libmedia_helper_tests Change-Id: Ib953892221d0d278bd29b3d3fd9bb92a79f3426d (cherry picked from commit d73ed7e9d3e225889f14eb1dca292c1be9520d25) Merged-In: Ib953892221d0d278bd29b3d3fd9bb92a79f3426d
2022-02-11A follow-up to Ultrasound flags additionMikhail Naganov1-0/+1
List AUDIO_SOURCE_ULTRASOUND as a valid source. Bug: 200256985 Test: atest android.hardware.audio.common@7.1-util_tests Change-Id: Ic2940fe7247bd34fb08ba239655e5fa003e93815 (cherry picked from commit cb5a75852bc05095bb2db59fcabc283166a087e3) Merged-In: Ic2940fe7247bd34fb08ba239655e5fa003e93815
2022-02-11audio: add flags and input source for UltrasoundCarter Hsu2-11/+16
Bug: 200256985 Test: build pass Signed-off-by: Carter Hsu <carterhsu@google.com> Change-Id: Idcb2b917fbea902c3f37641f340c25a95bbc00f2 (cherry picked from commit 7a650e4c3f67f36d44bbe353647a76fd41da3a2a) Merged-In: Idcb2b917fbea902c3f37641f340c25a95bbc00f2
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li22-29/+1287
Bug: 214455710 Merged-In: I820bbc0e70ac93d25c39c5152bf6a81db12f7e7e Change-Id: I1f8982bbaca4b0d61408cf0f11ceff62e52d67fd
2022-02-09Merge "audio: add Bluetooth LE Audio broadcast device" am: a48d92f274Eric Laurent2-0/+3
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1978306 Change-Id: Idecef12e7b23bb1328a8145e34a84b30a75cf64d
2022-02-09Merge "audio: add Bluetooth LE Audio broadcast device"android-t-preview-2android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1aosp-new/android-t-preview-1aosp-new/android-s-v2-beta-3aosp-new/android-s-qpr3-beta-1Eric Laurent2-0/+3
2022-02-09audio: add Bluetooth LE Audio broadcast deviceEric Laurent2-0/+3
Add audio device type definition for a Bluetooth LE audio broadcast group. Bug: 150670922 Test: make. Change-Id: Ic6ecf3e26e5ed4429e16f77bd686f120e21ca711 Merged-In: Ic6ecf3e26e5ed4429e16f77bd686f120e21ca711
2022-02-09Merge "Fix tee sink 12-channel file write" am: ca0b887497Andy Hung1-1/+1
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1976827 Change-Id: I1852cb6e0bc7d1e231f24f02a987e889b2597f87
2022-02-09Merge "Fix tee sink 12-channel file write"Andy Hung1-1/+1
2022-02-09Fix tee sink 12-channel file writeDean Wheatley1-1/+1
Test: TEE_SINK audio debug with 12-channel mixer thread Change-Id: I88fcd00f660d1487a6be455e4e0a80595a75e2e8
2022-02-08Merge changes from topic "upstream-hal-v7_1-p2" am: f3ba638590Treehugger Robot2-0/+7
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1975130 Change-Id: I6931d0dfbb60dc06c22e23ac21900625a8dec3e8
2022-02-08audio: add spatializer output flag am: 55a9331671Eric Laurent1-1/+2
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1975228 Change-Id: I4af559fa2e59c11874b1b5e8760b97c426d6d99f
2022-02-08Merge changes from topic "upstream-hal-v7_1-p2"Treehugger Robot3-1/+9
* changes: Audio HAL V7.1: Add latency modes definitions audio: add spatializer output flag
2022-02-07Audio HAL V7.1: Add latency modes definitionsEric Laurent2-0/+7
Latency mode control on audio HAL streams is optional but mandated if spatial audio with head tracking is supported over Bluetooth classic audio link. Currently defined latency modes are: - Low: a playback latency compatible with headtracking round trip latency requriements - Free: no specific requirement on playback latency. Bug: 187446271 Test: make Change-Id: I37442ebffc66946d17425c53ece2b0afd8189898 (cherry picked from commit f4adfa99fbe765235daaaa4fcef377b1ec4e3bb9) Merged-In: I37442ebffc66946d17425c53ece2b0afd8189898
2022-02-07audio: add spatializer output flagEric Laurent1-1/+2
Add output flag AUDIO_OUTPUT_FLAG_SPATIALIZER indicating an output mix port dedicated to spatial audio. Bug: 210803914 Test: manual spatial audio tests Change-Id: I1083b75917356298d6ea30b9f951012825e864c4 Merged-In: I1083b75917356298d6ea30b9f951012825e864c4
2022-02-04Merge "Fix -Wbitwise-instead-of-logical" am: 481bfc3839Pirama Arumuga Nainar1-3/+3
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1969100 Change-Id: I022797ab33bf191f7e7d3a4be2f41dd8b5984010
2022-02-04Merge "Fix -Wbitwise-instead-of-logical"Pirama Arumuga Nainar1-3/+3
2022-02-02Merge "Adding bluetooth apex to libs which it depends on" am: d9431efd91Roopa Sattiraju1-0/+4
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1932243 Change-Id: I6d1bb82445b0c88d7cf4aaa7b4bf0e6e9b4cdba5
2022-02-02Merge "Adding bluetooth apex to libs which it depends on"Roopa Sattiraju1-0/+4
2022-02-02Adding bluetooth apex to libs which it depends onRoopa Sattiraju1-0/+4
Bug: 206121418 Test: Compile Merged-In: I2c6fa412210dbaf96552de87a35a943f1b69db64 Change-Id: I2c6fa412210dbaf96552de87a35a943f1b69db64
2022-01-28Fix -Wbitwise-instead-of-logicalPirama Arumuga Nainar1-3/+3
Bug: http://b/215753485 This warning is introduced in clang-r445002. Introduce temporary variables to make it clear that both checks are performed. Test: build with clang-r445002 Change-Id: I4de46dd93ce36ff03c2b0349b025ef4ce8213e68
2022-01-11Merge "Fix audio_utils when compiling against musl" am: 7d58d1b1c9 am: ↵Colin Cross4-2/+7
135af7a5da am: 8d66a4f1c1 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1927576 Change-Id: I1ab6a3e1fa59c031573ceae9e69d823ac20bd4aa
2022-01-11Merge "Fix audio_utils when compiling against musl" am: 7d58d1b1c9 am: ↵Colin Cross4-2/+7
135af7a5da Original change: https://android-review.googlesource.com/c/platform/system/media/+/1927576 Change-Id: Ie6a04527b846ab2ef484311698fbc6d119aa18a3
2022-01-11Merge "Fix audio_utils when compiling against musl" am: 7d58d1b1c9Colin Cross4-2/+7
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1927576 Change-Id: I88faf3d67037c85dcebd39f4f799eeb9013fc0a3
2022-01-11Merge "Fix audio_utils when compiling against musl"Colin Cross4-2/+7
2021-12-15Fix audio_utils when compiling against muslColin Cross4-2/+7
Add missing headers required by musl, and adjust clock_nanosleep ifdefs. Bug: 190084016 Test: m USE_HOST_MUSL=true host-native Change-Id: I820bbc0e70ac93d25c39c5152bf6a81db12f7e7e
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: 089fc86193 -s ours ↵Xin Li0-0/+0
am: 889c73e334 -s ours am: 9bcb6d6686 -s ours am skip reason: Merged-In I44e07afa0df58fd2007b93640f3ad584f152359b with SHA-1 b3f0cbadb6 is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1921975 Change-Id: I3eba96302e3053ad844cb03af5c1b2e299b2b6cb
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: 089fc86193 -s ours ↵Xin Li0-0/+0
am: 889c73e334 -s ours am skip reason: Merged-In I44e07afa0df58fd2007b93640f3ad584f152359b with SHA-1 b3f0cbadb6 is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1921975 Change-Id: Ic68527c5eef5b073bbaa7de9eeffdc5dc74acbb8
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: 089fc86193 -s oursXin Li0-0/+0
am skip reason: Merged-In I44e07afa0df58fd2007b93640f3ad584f152359b with SHA-1 b3f0cbadb6 is already in history Original change: https://android-review.googlesource.com/c/platform/system/media/+/1921975 Change-Id: If6b7d43c0c42ed527be67af4f5d8b8b585dc3c1b
2021-12-14Merge "Merge Android 12 QPR1"Xin Li4-68/+68
2021-12-14Merge Android 12 QPR1Xin Li4-68/+68
Bug: 210511427 Merged-In: I44e07afa0df58fd2007b93640f3ad584f152359b Change-Id: I7765b77285d9b354c42c8811d6868cbb41daa41a
2021-12-10Camera: Update JPEG size override condition for MPC13 am: ba40f06ea9Shuzhen Wang2-14/+22
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/16409002 Change-Id: I999ba100108cbfb58abb9f357c0e899b01faeab0
2021-12-10Merge "Change media OWNERS. Remove gkasten. Add philburk" am: 2d56245375 am: ↵Phil Burk1-1/+1
b3f0cbadb6 am: dfd1e36ca1 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1897157 Change-Id: Ic8297a607e1abc4b46bfd5e4641427cd476f5cbd
2021-12-10Merge "Change media OWNERS. Remove gkasten. Add philburk" am: 2d56245375 am: ↵Phil Burk1-1/+1
b3f0cbadb6 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1897157 Change-Id: Ide571ab47af8513d8beab17b6ec7929fd1b6af62
2021-12-10Merge "Change media OWNERS. Remove gkasten. Add philburk" am: 2d56245375aosp-new/temp-sc-samPhil Burk1-1/+1
Original change: https://android-review.googlesource.com/c/platform/system/media/+/1897157 Change-Id: I44e07afa0df58fd2007b93640f3ad584f152359b
2021-12-10Merge "Change media OWNERS. Remove gkasten. Add philburk"Phil Burk1-1/+1
2021-12-07Camera: Update JPEG size override condition for MPC13aosp-new/android12L-devShuzhen Wang2-14/+22
The JPEG size override is done only when the android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS is set to 31 or larger, and not necessarily for every MPC13 devices. Bug: 209622756 Test: Build Change-Id: I068167561dd30ae833ba59fb229231bd09ebc52b