Commit graph

889 commits

Author SHA1 Message Date
Rajat Kumar
1eaddc69d3 Fix for infinite loop in drc selection process am: 6398ab8de5 am: 6bb106faaa am: c8a90c8a1f
Original change: 1440592

Change-Id: I7535dd2d17210ce9bb000609fd2e8bdd7d534d94
2020-10-06 20:15:58 +00:00
Rajat Kumar
c8a90c8a1f Fix for infinite loop in drc selection process am: 6398ab8de5 am: 6bb106faaa
Original change: 1440592

Change-Id: I4bfb702333a3b391bd49d1bc56359cef9aed27cf
2020-10-06 19:56:48 +00:00
Rajat Kumar
6bb106faaa Fix for infinite loop in drc selection process am: 6398ab8de5
Original change: 1440592

Change-Id: I98e70bbd2239b3fb61b77ceb05fcef096a09600c
2020-10-06 18:53:27 +00:00
Rajat Kumar
6398ab8de5 Fix for infinite loop in drc selection process
DRC should not permit the configurations that
exceed the total supported complexity.

Bug: 167279883
Test: poc in bug

Change-Id: Icffa42cdcd9184d434b7a0bfa1b11ebd5ec4af71
2020-10-05 22:57:31 +05:30
Ray Essick
f901ed5fe7 Merge "Fix to handle segv in impd_filter_banks_process" am: e5c5475c98 am: 060e1f9a11 am: 3ed0b59dc6 am: 207c438c0c
Original change: 1425116

Change-Id: Ia30b464c94373a5dc8e2f19d61e517349720f884
2020-09-30 19:04:47 +00:00
Ray Essick
207c438c0c Merge "Fix to handle segv in impd_filter_banks_process" am: e5c5475c98 am: 060e1f9a11 am: 3ed0b59dc6
Original change: 1425116

Change-Id: I812e6b72309bfd0aa83b4bdd729face4def77adb
2020-09-30 18:52:57 +00:00
Ray Essick
3ed0b59dc6 Merge "Fix to handle segv in impd_filter_banks_process" am: e5c5475c98 am: 060e1f9a11
Original change: 1425116

Change-Id: Ide76e7b6665f82c16d4df71c6c7db6c11cbd2d4c
2020-09-30 18:41:09 +00:00
Ray Essick
060e1f9a11 Merge "Fix to handle segv in impd_filter_banks_process" am: e5c5475c98
Original change: 1425116

Change-Id: I8ef47b89b1764a40351c85d4e9484bfcc7a49810
2020-09-30 18:29:14 +00:00
Ray Essick
e5c5475c98 Merge "Fix to handle segv in impd_filter_banks_process" 2020-09-30 16:54:42 +00:00
Treehugger Robot
3cb8890af3 Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" am: bf603c488f am: d836d24c78 am: 6772b2f2fc am: 2485448203
Original change: 1425113

Change-Id: I7a9c6dcaa1b1c2a5d66399e6613fd357396975fe
2020-09-30 03:39:40 +00:00
Treehugger Robot
df295c1d15 Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3 am: 3a78862c00 am: b74b5dfe38
Original change: 1426791

Change-Id: Ie8e65f6a2cd369d20e10f20fff88d5387455ae4c
2020-09-30 03:39:32 +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
Treehugger Robot
2485448203 Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" am: bf603c488f am: d836d24c78 am: 6772b2f2fc
Original change: 1425113

Change-Id: I99874c54ab797e24eb5fd0e52a3985f55eb03a8a
2020-09-30 03:04:41 +00:00
Treehugger Robot
b74b5dfe38 Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3 am: 3a78862c00
Original change: 1426791

Change-Id: Id30a1485b8c3e877e0a4ddf1d28e5d3bed06c629
2020-09-30 03:04:34 +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
Treehugger Robot
6772b2f2fc Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" am: bf603c488f am: d836d24c78
Original change: 1425113

Change-Id: Iad4373e2ca1e5c12563012bd5f346f5c6d8dd768
2020-09-30 02:38:36 +00:00
Treehugger Robot
3a78862c00 Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3
Original change: 1426791

Change-Id: Iff1708130faa2d83dca8b2fea610a6f13e537a85
2020-09-30 02:38:30 +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
Treehugger Robot
d836d24c78 Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" am: bf603c488f
Original change: 1425113

Change-Id: Ic80a89d40b373832016ebbcbd85e3702f2383356
2020-09-30 02:18:47 +00:00
Treehugger Robot
2804d872a3 Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd
Original change: 1426791

Change-Id: Iadb6e1b4483813e5dc86befcd75f39e9a9106397
2020-09-30 02:18:40 +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
Treehugger Robot
bf603c488f Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" 2020-09-30 02:15:07 +00:00
Treehugger Robot
d5111468cd Merge "Fix for NPD in ixheaacd_init_sbr" 2020-09-30 02:11:08 +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
Rajat Kumar
2f905017d6 Fix for NPD in ixheaacd_init_sbr
Added check for AOT(read from bit stream) mismatch,
between two consecutive execute calls while decoding
LATM header.

Bug: 168429291
Test: poc in bug

Change-Id: I64b3e38c97499b1103c9cc5594742b804e0a3965
2020-09-29 18:11:57 +05:30
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
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
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
f2d380ca2e Fix to handle segv in impd_filter_banks_process
Added check to ensure array size of
buf_interpolation->lpcm_gains does not
exceed allotted size.

Bug: 161819862
Test: poc in bug

Change-Id: I7e554d70ada8d92ee3496c0fbdfc78cee55e4697
2020-09-12 01:21:42 +05:30
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
8ba7e99fb3 Fix for integer overflow in ixheaacd_cplx_synt_qmffilt
Added saturation checks to avoid integer overflow.

Bug: 158398386
Test: poc in bug

Change-Id: Ib4f10e07a4c6069452d38e87413fac755c056bae
2020-09-11 21:27:53 +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
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