Commit graph

931 commits

Author SHA1 Message Date
Ray Essick
61a4d7ee29 Merge "Fix for array out of bound access in impd_drc_get_gain" am: 7d0fd974c9 am: e6d24ebe23 am: e626d6d509 am: d9e5ecdcdb am: e46656b338
Original change: 1425115

Change-Id: I5ff7c48691f294ca549072c50ea7ae66657725f0
2020-09-30 04:01:22 +00:00
Ray Essick
e46656b338 Merge "Fix for array out of bound access in impd_drc_get_gain" am: 7d0fd974c9 am: e6d24ebe23 am: e626d6d509 am: d9e5ecdcdb
Original change: 1425115

Change-Id: Ic376c6474dd6dd5b43350c1473a0a618a9939d9d
2020-09-30 03:38:56 +00:00
Ray Essick
d9e5ecdcdb Merge "Fix for array out of bound access in impd_drc_get_gain" am: 7d0fd974c9 am: e6d24ebe23 am: e626d6d509
Original change: 1425115

Change-Id: I9fe0102018978335da829d120b0b8329e3199db3
2020-09-30 03:00:59 +00:00
Ray Essick
e626d6d509 Merge "Fix for array out of bound access in impd_drc_get_gain" am: 7d0fd974c9 am: e6d24ebe23
Original change: 1425115

Change-Id: I3d8c68ae82659d136762a52dfcc232aebc7d4bfe
2020-09-30 02:37:55 +00:00
Ray Essick
e6d24ebe23 Merge "Fix for array out of bound access in impd_drc_get_gain" am: 7d0fd974c9
Original change: 1425115

Change-Id: I8ed0466f48529906f66499d114aa7b84f4099337
2020-09-30 02:18:06 +00:00
Ray Essick
7d0fd974c9 Merge "Fix for array out of bound access in impd_drc_get_gain" 2020-09-30 01:57:47 +00:00
Treehugger Robot
85d0e7bd86 Merge "Include a shared media team OWNERS for easier management" am: dfdea72c18 am: 32dade05c9 am: 057e78da92 am: f50e3a5192 am: 88dc498264
Original change: 1392882

Change-Id: I5fceb9a250e2227ed4fc36b6a4d44a4d846b71cf
2020-09-16 04:31:20 +00:00
Treehugger Robot
88dc498264 Merge "Include a shared media team OWNERS for easier management" am: dfdea72c18 am: 32dade05c9 am: 057e78da92 am: f50e3a5192
Original change: 1392882

Change-Id: I20c4418e026d2648a1cb5c8a19db8a0dba5357d8
2020-09-16 03:42:16 +00:00
Treehugger Robot
f50e3a5192 Merge "Include a shared media team OWNERS for easier management" am: dfdea72c18 am: 32dade05c9 am: 057e78da92
Original change: 1392882

Change-Id: I81db40154ebb7f667eb4d0cbbb5a1ab83cd0ceaa
2020-09-16 03:14:10 +00:00
Ray Essick
7324c6ab31 point to new repo hooks for mainline uploads am: 9087c50905 am: 7771ba7bf2
Original change: 11605765

Change-Id: Ib61ecb4d8f797b637ae9c34ea0895b232ff0b988
2020-09-16 02:27:34 +00:00
Treehugger Robot
057e78da92 Merge "Include a shared media team OWNERS for easier management" am: dfdea72c18 am: 32dade05c9
Original change: 1392882

Change-Id: I60fdd3beb9e239bbe2bbc074b0ca799cb5bfa1e6
2020-09-16 02:26:48 +00:00
Treehugger Robot
32dade05c9 Merge "Include a shared media team OWNERS for easier management" am: dfdea72c18
Original change: 1392882

Change-Id: Ic4448d50e4ff6648b6238ff159ffeed750741eb2
2020-09-16 01:57:25 +00:00
Treehugger Robot
dfdea72c18 Merge "Include a shared media team OWNERS for easier management" 2020-09-16 01:28:36 +00:00
Ray Essick
9323c47fb3 Include a shared media team OWNERS for easier management
Bug: 162786146
Test: n
Change-Id: If329fabafe0a1f46ecd9e31cb17a1d2c716aa3d2
2020-09-15 18:15:12 +00:00
Rajat Kumar
38dd720c69 Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482 am: 21a96efe69 am: 73a0c8e399
Original change: 1425114

Change-Id: Idc9f8ef915d53e33ddd9c9b9169b0006d51d87d3
2020-09-12 07:00:34 +00:00
Rajat Kumar
73a0c8e399 Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482 am: 21a96efe69
Original change: 1425114

Change-Id: I4dd3fda28fd7d061c6efca479683eb0896a04c4e
2020-09-12 06:23:04 +00:00
Rajat Kumar
21a96efe69 Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482
Original change: 1425114

Change-Id: Ie42ec1c1141b6dcc347459a53bb2d354681a0184
2020-09-12 05:46:28 +00:00
Rajat Kumar
969c6ce482 Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9
Original change: 1425114

Change-Id: I4ec39bc76cd0353172b5dba2167591c3f8d6553a
2020-09-12 05:10:06 +00:00
Rajat Kumar
154faafaa9 Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de
Original change: 1425114

Change-Id: Ic078e82ca63440dec3084a1d5ca9f5d9515efc3c
2020-09-12 04:40:32 +00:00
Rajat Kumar
5bcf81b549 [automerger skipped] Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07 am: 0ca3b0b8f6 am: aaac00c094 -s ours
am skip reason: Change-Id Iea7bb9959fffd7a0e4f345f86581a1328e04a38e with SHA-1 d198c6af56 is in history

Original change: 1425108

Change-Id: I95d68825f4cbad33333aa5d1986137368939ef5f
2020-09-11 23:57:51 +00:00
Xin Li
6e28c63450 [automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours am: eb8e4080e8 -s ours am: 26e171ffe3 -s ours
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: 1422379

Change-Id: I257daa81c154d856db852c19abd28cc08765110b
2020-09-11 21:27:28 +00:00
Rajat kumar
794c837036 Fix for array out of bound access in impd_drc_get_gain
Add necessary checks to avoid any possible array
out of bounds operation in the impd_drc_get_gain
function.

Bug: 161820233
Test: poc in bug

Change-Id: Ie55fbbc18c76f224983d1032641de4df4dce3fb3
2020-09-11 21:50:48 +05:30
Rajat Kumar
a741e1d5de Fix for Null-dereference read in ixheaacd_init_sbr
Header decode is done with AOT 2 (AAC-LC profile),
but due to corrupted nature of input file AOT is read
as 42 (USAC profile) after few memory/table initializations.

As fix, modified the check to prevent an attempt
to change AOT in mid file.

Bug: 160389683
Test: poc in bug

Change-Id: Id95aa74b0833321b29b602d97b14c5a5580ef7fc
2020-09-11 21:41:49 +05:30
Rajat Kumar
aaac00c094 Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07 am: 0ca3b0b8f6
Original change: 1425108

Change-Id: I727ff509fbde9067dddb50a1eae4d37daa3c8d3c
2020-09-11 04:53:09 +00:00
Xin Li
26e171ffe3 [automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours am: eb8e4080e8 -s ours
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: 1422379

Change-Id: I8172dd5e71e2734ac88f8e776055aca1cb6598af
2020-09-11 03:58:59 +00:00
Rajat Kumar
0ca3b0b8f6 Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07
Original change: 1425108

Change-Id: I3f7133b892ba7abad8e92946d362cfccdd41e977
2020-09-11 03:53:02 +00:00
Xin Li
eb8e4080e8 [automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: 1422379

Change-Id: I52aa4c5101309432f2238dea2cc0e0ea4de8e2b6
2020-09-11 03:33:28 +00:00
Rajat Kumar
9ef235ec07 Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5
Original change: 1425108

Change-Id: Ic4aa96be38c5f425ff7145121e61f79f775cbff8
2020-09-11 02:14:44 +00:00
Xin Li
f54123577f [automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: 1422379

Change-Id: Icebeef13b26e5e4212c7fdf95c0f96bce6bffddb
2020-09-11 02:02:37 +00:00
Rajat Kumar
f98b3e9ee5 Fix to handle missing checks on error returned am: bcbd383251
Original change: 1425108

Change-Id: Iffed7e7a1de829df0e099558b09dcb1904ea9fc5
2020-09-11 00:56:43 +00:00
Xin Li
e48e13f994 [automerger skipped] Merge Android R am: 26fedcbb46 -s ours
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: 1422379

Change-Id: Ie3d384941b15566706d4f8bcebd68a2863511f3e
2020-09-11 00:40:06 +00:00
Rajat Kumar
bcbd383251 Fix to handle missing checks on error returned
Added missing return checks and converted
functions to void which doesn't return anything
other than zero.

Test: Review
Test: atest android.media.cts.DecoderTest
Bug:131183694

Change-Id: Iea7bb9959fffd7a0e4f345f86581a1328e04a38e
Merged-In: Iea7bb9959fffd7a0e4f345f86581a1328e04a38e
2020-09-10 12:48:42 -07:00
Xin Li
26fedcbb46 Merge Android R
Bug: 168057903
Merged-In: Ice88af6abbaec9ae277a56fcf7df516ba2e9486f
Change-Id: Id25da2bf82cd73fddf16c439f775d8f085ebec30
2020-09-08 16:54:39 -07:00
Xin Li
51aed09447 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours am: 9dfa1ac9c0 -s ours am: 24ad8bf36f -s ours
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def is in history

Original change: 12470012

Change-Id: I8e5b1bb8c8b79d41190ec17d545916db2d6dda19
2020-09-02 01:59:21 +00:00
Xin Li
24ad8bf36f [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours am: 9dfa1ac9c0 -s ours
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def is in history

Original change: 12470012

Change-Id: Ibdf00cab176797951d12dfa2b20da4793fac1de0
2020-09-01 22:09:56 +00:00
Xin Li
9dfa1ac9c0 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def is in history

Original change: 12470012

Change-Id: Iba07904e994028a9167a719678d46cb1158dccf7
2020-09-01 21:46:40 +00:00
Xin Li
33869c086d [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def is in history

Original change: 12470012

Change-Id: I70a1e7b8a217f310f5220d9dd93fe6909e00f23f
2020-09-01 20:37:04 +00:00
Xin Li
386b47b4b1 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:03:58 +00:00
Stephen Hines
4e731e95d9 Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea am: 40accb2e61 am: 3484cf02b8
Original change: 1414133

Change-Id: Ia0f32adbbe44f1be3f7b62ca51445903baf61125
2020-08-28 20:11:56 +00:00
Stephen Hines
3484cf02b8 Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea am: 40accb2e61
Original change: 1414133

Change-Id: Ia78854136cea1f92dc8b524eb32a40b699cab634
2020-08-28 19:56:17 +00:00
Stephen Hines
40accb2e61 Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea
Original change: 1414133

Change-Id: I5c57bb949d8a6910dd10a1ce019187f1353b2872
2020-08-28 19:39:47 +00:00
Stephen Hines
3d799dd6ea Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0
Original change: 1414133

Change-Id: I3b0dc2b0259086a1a18fe3aed8c9f7434a937ac3
2020-08-28 19:09:10 +00:00
Stephen Hines
924a4628e0 Properly mark the type for ARM assembly functions. am: 331810f057
Original change: 1414133

Change-Id: Ice88af6abbaec9ae277a56fcf7df516ba2e9486f
2020-08-28 18:32:16 +00:00
Stephen Hines
331810f057 Properly mark the type for ARM assembly functions.
These functions may be called by either ARM or Thumb, and LLD has gotten
more strict. The global symbols must be marked with the proper type
annotations in order for the relocations to be correct.

ld.lld: error: external/libxaac/decoder/armv7/ixheaacd_qmf_dec_armv7.c:353:(.text.ixheaacd_esbr_cos_sin_mod+0x3A0): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: ixheaacd_esbr_cos_sin_mod_loop2 interworking not performed; consider using directive '.type ixheaacd_esbr_cos_sin_mod_loop2, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required

Bug: 155835175
Test: mm for ARM based build
Change-Id: I063cd9716402aaaebbd4273776eadb70314bf5f9
2020-08-27 19:47:23 -07:00
Xin Li
0312fc42cb Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I67a2f4be536fd22a9cc615088ce6368223311cf2
Change-Id: Iea753fbdfd54db2a0c5499ca481767192ccc55ca
2020-08-27 10:16:29 -07:00
Pirama Arumuga Nainar
35bc695d7b resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea am: f44a5a1898 am: 834c57586a
Original change: 12273973

Change-Id: Ibbb6b6529ad0c599baaea427805287a172a63eb1
2020-07-31 00:11:43 +00:00
Pirama Arumuga Nainar
834c57586a resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea am: f44a5a1898
Original change: 12273973

Change-Id: I387b72cda62d8765beba31e492a2e2c750ff08b9
2020-07-30 23:53:57 +00:00
Pirama Arumuga Nainar
f44a5a1898 resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea
Original change: 12273973

Change-Id: I0ed32ddd6f5957a57c161cf748eacf48b0de4976
2020-07-30 23:35:51 +00:00
Pirama Arumuga Nainar
1713b4bfea resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp 2020-07-30 21:32:16 +00:00
Pirama Arumuga Nainar
d6f04bfbc2 Use blocklist sub-property in sanitize am: 6122d8fdb2
Original change: 1375090

Change-Id: If29783c0da0d859af752b074dd3f9f8c0f2e6eea
2020-07-30 21:07:48 +00:00