Commit Graph

1755 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK 648d33f8af [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7 am: d71bdb8fa4 -s ours am: c933b13d82 -s ours
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643

Change-Id: Icc556560125c6309444b7c3ab164932bb7ad8243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:50:41 +00:00
Fraunhofer IIS FDK c933b13d82 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7 am: d71bdb8fa4 -s ours
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643

Change-Id: I327326f0f1a25b5e950531bc2f48a5226efbe6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 18:40:05 +00:00
Fraunhofer IIS FDK d71bdb8fa4 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643

Change-Id: I968eb9733f397cb354adf68b536436b44102eeb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 17:55:28 +00:00
Fraunhofer IIS FDK f1b90b8dff Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: cf141c714f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497644

Change-Id: Ieb9f45ff464225c80a170c296dc17058e6f56e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 17:53:00 +00:00
Fraunhofer IIS FDK cf141c714f Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
2023-05-31 19:05:30 +00:00
Fraunhofer IIS FDK 2f8c08a4e7 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
2023-05-31 19:04:44 +00:00
Treehugger Robot f0f384d363 Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4 am: b3318ce691
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630

Change-Id: I06f7f454988a27cf05c329b85d7bc668eb5673d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 17:42:45 +00:00
Treehugger Robot bc912c4780 Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07af am: dc087c5c90
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610

Change-Id: Ib91dbddb88fcab7c2e3d8128fedc13b84ec2e510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 17:42:43 +00:00
Treehugger Robot b3318ce691 Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630

Change-Id: I68a2aba4720b5615111e1fd07a334e43ae6d5718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 17:00:19 +00:00
Treehugger Robot dc087c5c90 Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07af
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610

Change-Id: I8d29d1b5b13251bd3f375da79156dfeead7104d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 17:00:17 +00:00
Treehugger Robot aa9650bdc4 Merge "Disable MPEG-D DRC for legacy AOTs" 2023-05-01 16:18:51 +00:00
Treehugger Robot 7f83eb07af Merge "Remove obsolete uni drc precedence handling" 2023-05-01 16:18:51 +00:00
Jean-Michel Trivi b5b590367a Disable MPEG-D DRC for legacy AOTs
Disable MPEG-D DRC metadata for legacy AOTs 2 (AAC-LC), 5 (HE-AAC),
and 29 (HE-AAC v2).

Bug: 241391733
Test: see bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2f4c595c4abd721967ecb494f5aec3f6b6dafb9e)
Merged-In: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
Change-Id: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
2023-04-25 17:11:39 +00:00
Jean-Michel Trivi 167dcc380a Remove obsolete uni drc precedence handling
Bug: 241391733
Test: see bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c41b05b6c60275c2a6b28918f40c218a8b818f6)
Merged-In: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
2023-04-25 17:11:26 +00:00
Jean-Michel Trivi a6afc4ee44 Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657

Change-Id: I9219ef758ffb43804959a70204dce05de88447ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 21:07:12 +00:00
Jean-Michel Trivi 18cb3fccf6 Merge "Correct comment spelling error." am: 0f065e796b
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657

Change-Id: Ifeddd337fb8c4b648aaafb8c86c94ea4fa904f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 20:24:48 +00:00
Jean-Michel Trivi 0f065e796b Merge "Correct comment spelling error." 2023-04-04 19:59:06 +00:00
wujianxing1 477ac94c2d Correct comment spelling error.
Change-Id: I2b0451986e70d0fbb7fefa5bbb95b1ca98e4f7ac
Signed-off-by: wujianxing1 <wujianxing1@xiaomi.corp-partner.google.com>
2023-04-03 17:06:00 +08:00
Treehugger Robot a30d828f33 Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: If1c06433eb568c9823c89d86ba6686ac4ac7366d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 23:13:55 +00:00
Treehugger Robot 87b22603e8 Merge "Add riscv64 support" am: 75e9f62078
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: I4d5851ffc1e5e1892ec83209045ccf3bf4b188cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 22:29:53 +00:00
Treehugger Robot 75e9f62078 Merge "Add riscv64 support" 2022-11-04 21:52:02 +00:00
Treehugger Robot 6097888451 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0 am: 34effe2f68
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: I90093847a2efe1b5af80f14712353a3531e1c9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 00:28:39 +00:00
Treehugger Robot 34effe2f68 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Ic2dda304ecfb4d8c520c30ffd95b704497260d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:33:49 +00:00
Treehugger Robot 1b918d8de0 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: I20beda4ed1fcf0a060e0ca03d6e76a161d499aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:03:06 +00:00
Treehugger Robot 82c5dbb07b Merge "[Bluetooth apex] Use new apex name" am: f9820781d9
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Iaea278a4c8c276598c1d9d7b6a6495a2faad0591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:40:31 +00:00
Treehugger Robot f9820781d9 Merge "[Bluetooth apex] Use new apex name" 2022-08-23 21:05:13 +00:00
William Escande 2bb735c4fb [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: I504a8727ddf73d3568616bc0f57983331dd28744
2022-08-22 11:27:53 -07:00
haocheng.zy 3aabcb6abd Add riscv64 support
Signed-off-by: Zhang Ye <haocheng.zy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>

Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328
2022-08-01 16:27:30 +08:00
Treehugger Robot 9cf12aa868 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I8ef7094e0c67b956b2c7302a247b26323cdd9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:32:46 +00:00
Xin Li 580e9caedd DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 am: a5b4e7363f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ib7c8008cf259618654de2d4a9c23fc26310741ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:32:00 +00:00
Treehugger Robot 2c2abe9736 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I4018d2e225aefd674fddc8691cfeb0c9d2a3ac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:03:17 +00:00
Xin Li a5b4e7363f DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ia1f3936ec9a751e6bc8e9b31e5130976b0bd2276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:02:32 +00:00
Treehugger Robot 8da1061f74 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I17ca4d9dc314d0b286708b079cdb9464be99e942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:28:06 +00:00
Xin Li 94a09cf355 DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I5e56b7dd29b51efb2fb330832f7b990d5f735408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:27:24 +00:00
Xin Li 85b17c8c10 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours am: 2e02d4c91c -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I32589f68cdaf3ae48930b21947e79d615b4d41b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:54:00 +00:00
Xin Li f7594a4c73 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ife4349f0a7ab64120e0bb4fba0c6e1b72465ad49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:52:43 +00:00
Treehugger Robot 8f53fdaaa6 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: If09f84637bfd45a2ded9516104de2e7ae520d402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:07:13 +00:00
Xin Li 181d0ef5e2 DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I5cf15e7b63c5874ada7ec110523d5f1e2bb83157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:06:26 +00:00
Xin Li 2e02d4c91c [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I42c52aac9bcff66d7dbeb5da3964bc1039827306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:57:41 +00:00
Xin Li 9eb437d8ca [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ie7f7e1b880623ccf0377038c48ad0bec25ebf7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:56:25 +00:00
Treehugger Robot 2231acfd62 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:01 +00:00
Xin Li bc7c5b55b5 DO NOT MERGE - Skip SQ3A.220605.009
Bug: 236045730
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Change-Id: Ie0ca07f0aa6ea25a02e3702745c1ab1b6fd55bc9
2022-06-16 22:50:42 -07:00
Xin Li 1a013376bd [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:15:36 +00:00
Xin Li 3d2637ce9a [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I9f4e52edb80ba867982c657f12f79b2fe2a17e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:20 +00:00
Xin Li 5ccfd6ac78 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I7881f686f3011850e299efde8c2588f5d7ceaff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:58:37 +00:00
Xin Li 3c9fe29541 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: If8b5a0cf1530fd8f49ceda4fd767bf4f67827e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:13 +00:00
Xin Li cb00f5235d Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:56 +00:00
Xin Li 0ace73f2d3 Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I4df938df7886adc58185586190e27bcd16e17966
Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
2022-06-14 16:48:08 -07:00
Xin Li 2c16a17358 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I9eb7a01dbe13825311174b700169cd7b8387fc4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:33:18 +00:00
Xin Li 7e1fb037c7 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: Iff0bc9acb8d2f99e7bdddb84bd8e054255e09373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:13:25 +00:00