Commit Graph

2123 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK 46c53ba0cb 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:00:57 +00:00
Fraunhofer IIS FDK 451762ca48 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 18:59:04 +00:00
Fraunhofer IIS FDK 0c4954dd87 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 18:56:49 +00:00
Treehugger Robot 2d5b94d481 [automerger skipped] Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4 am: b3318ce691 am: f0f384d363 -s ours
am skip reason: Merged-In Ie84badaa24bb4169adfdb1d3243525c32b44d3e9 with SHA-1 2f4c595c4a is already in history

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

Change-Id: Ia3e3f1c4772a1ee64c99fae0b0318f176c108d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 18:28:39 +00:00
Treehugger Robot 182d1982a2 [automerger skipped] Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07af am: dc087c5c90 am: bc912c4780 -s ours
am skip reason: Merged-In I0ddc479626fb6a89d04bc989256ad1d8ec4275a3 with SHA-1 4c41b05b6c is already in history

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

Change-Id: I3b05500a54a5cd9db8aafbb1ec09c4ae2cef932a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 18:28:36 +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
Fraunhofer IIS FDK 7db7dc35b9 Remove obsolete uni drc precedence handling am: 4c41b05b6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789795

Change-Id: I1918a1e75e006ab291625065bba8943237777f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 17:23:06 +00:00
Jean-Michel Trivi a6ab9ba89b Disable MPEG-D DRC for legacy AOTs am: 2f4c595c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789794

Change-Id: Icfb2b46c74449cd0ed4b1aa4721fbcf7d4a27c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 17:23:04 +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
Fraunhofer IIS FDK 4c41b05b6c Remove obsolete uni drc precedence handling
Bug: 241391733
Test: see bug
Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
2023-04-21 18:23:24 -07:00
Jean-Michel Trivi 2f4c595c4a 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
Change-Id: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
2023-04-21 17:14:34 -07:00
Jean-Michel Trivi 9a1d7af5d5 Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 am: a6afc4ee44
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657

Change-Id: I0ccbc0c4671d836dd385a6b82b85bef7f974248f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 21:37:40 +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
Ayushi Khopkar e575d5741d Updated fuzz_config in Android.bp file
Added new fields in fuzz_config like - hotlists,
description, vector, service_privilege, users, fuzzed_code_usage, etc.

Bug: 271384401
Test: Build aac_dec_fuzzer and aac_enc_fuzzer

Change-Id: I2637accffa42e37fc90e19b531ca5aef299b811e
2023-03-06 11:13:25 +05:30
Martin Storsjo 7cb7d8c181 Update the version numbers in the public installed headers
Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: I44537c067e6ef34e77a67d02d8e9a8e9dfffab92
2022-12-09 04:19:16 +00:00
Martin Storsjo 32c697660d Include the encoder library version in the publicly installed header
This allows callers to conditionally use new API features without
breaking compatibility with the earlier versions of the library.

Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: Icdf18317e120caf8be750a839ae75a6ac8eba142
2022-12-01 21:48:47 +00:00
Treehugger Robot 2032bc891f Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 am: a30d828f33
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: I0d4764f69e5075df012ee7ad7c059881dcff69d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 23:46:45 +00: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 433a135d67 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0 am: 34effe2f68 am: 6097888451
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Ib205b865950336bf275640c891fd111ca8c1e22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:14:36 +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 de4a1d6125 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736 am: 9cf12aa868 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia697176fcde810faa01a30e669cd17cd7a921dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:58:34 +00:00
Xin Li af845c3530 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 am: a5b4e7363f am: 580e9caedd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb7e5a23c273f1c4419316fb4ea9f0e5e8246b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:57:46 +00: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
Xin Li d722264e24 [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: 85b17c8c10 -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: Idfdf539fd4874772c3bef65519ddaec869361b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:34:51 +00:00
Xin Li e579056830 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -s ours am: f7594a4c73 -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: If0480b81892c6f79f4a6c3cd58f523d6ae82d127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:33:36 +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