Commit graph

699 commits

Author SHA1 Message Date
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
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
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
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
d6f04bfbc2 Use blocklist sub-property in sanitize am: 6122d8fdb2
Original change: 1375090

Change-Id: If29783c0da0d859af752b074dd3f9f8c0f2e6eea
2020-07-30 21:07:48 +00:00
Pirama Arumuga Nainar
6122d8fdb2 Use blocklist sub-property in sanitize
Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: build topic
Change-Id: I3bd7ee99914a13961e2afa7062a7019c24d01a46
2020-07-28 14:37:34 -07:00
Kris Alder
473ba97def Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2ac
Original change: 1318980

Change-Id: I67a2f4be536fd22a9cc615088ce6368223311cf2
2020-06-05 16:26:48 +00:00
Kris Alder
08c901b2ac Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6
Original change: 1318980

Change-Id: Ic82f3c16e55e9e2a31d513f31fd5a871febf5981
2020-06-05 16:09:42 +00:00
Kris Alder
a4cd8c6bf6 Merge "Added fuzz_config field in xaac_dec_fuzzer" 2020-06-05 15:50:05 +00:00
Ray Essick
64c0efeb63 point to new repo hooks for mainline uploads am: 9087c50905
Change-Id: I1a514cd955ef723b09645309a6b6dc017030d67a
2020-05-29 23:49:26 +00:00
Harish Mahendrakar
92eb474c68 Added fuzz_config field in xaac_dec_fuzzer
Test: ./xaac_dec_fuzzer
Bug: 157680018
Change-Id: I39a49f14638cd55a216f2b5d025da2283371c480
2020-05-28 14:34:04 -07:00
Ray Essick
9087c50905 point to new repo hooks for mainline uploads
Bug: 157501573
Test: upload
Change-Id: I6c597f289e4953b43cdbd683d633a90bd5bb9bc9
2020-05-26 15:19:12 -07:00
Rajat Kumar
514510a33c Fix for build errors with -Wunreachable-code-loop-increment flag am: 750dd58c8d am: ce1b551e99
Change-Id: I0bfff50cf05734d3033f9ac9581807f44c05b6e4
2020-05-15 02:56:25 +00:00
Rajat Kumar
ce1b551e99 Fix for build errors with -Wunreachable-code-loop-increment flag am: 750dd58c8d
Change-Id: I596bac88cd2e19078176b9cafb4d7e1ba0ee78bd
2020-05-15 02:42:06 +00:00
Rajat Kumar
750dd58c8d Fix for build errors with -Wunreachable-code-loop-increment flag
For loop was redundant as the execution
was being done for once. Hence removed in the
present fix.

Bug: 156359506
Test: Build with -Wunreachable-code-loop-increment flag added
Test: xaacdec

Change-Id: I252551cff09fa9b033ef715127ee153645e3055f
2020-05-14 23:34:56 +05:30
Bob Badour
c7b2c56a23 Add METADATA to libxaac: Apache2=NOTICE am: b674a33043 am: c451737b56
Change-Id: Id8bcd94c144ae6bd8ca9129a1c8f91f8d153d204
2020-05-01 15:08:56 +00:00
Bob Badour
c451737b56 Add METADATA to libxaac: Apache2=NOTICE am: b674a33043
Change-Id: Iad69db69d1b5d4273897d0ddb324b2796f38417b
2020-05-01 14:55:45 +00:00
Bob Badour
b674a33043 Add METADATA to libxaac: Apache2=NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I067c7b0f4ebdaebae520978d5bfb14453f1136bc
2020-04-28 10:31:46 -07:00
Sushanth Patil
e14fc3836b Optimisation changes in ixheaacd_samples_sat am: 92bec05d2d
Change-Id: I353d26eb67c8a26b213c348aeda564715ab7252f
2020-04-23 21:42:30 +00:00
Sushanth Patil
94df05eeb4 Optimisation changes in esbr synthesis filter block am: 05c7402a06
Change-Id: I8791cb7f5088575ea5af009ed881e2c8ef0bf6f3
2020-04-23 21:42:21 +00:00
Sushanth Patil
a3c04e8969 Optimisation changes in saturation functions am: 0708a5228b
Change-Id: Id0be0ffb617d90ecac6b457305e0add28ebb360d
2020-04-22 16:17:49 +00:00
Sushanth Patil
92bec05d2d Optimisation changes in ixheaacd_samples_sat
Changed 64-bit operations used for saturating the
output pcm to 32 bit operations targeted towards
32-bit/armv7 architecture.

Bug: 154143053
Test: xaacdec

Change-Id: I3914f5a92feee592626fb53ca7e24b60dda59db4
2020-04-18 08:15:56 -07:00
Sushanth Patil
05c7402a06 Optimisation changes in esbr synthesis filter block
Some computation were not required when mps and sbr are present.
Added a check to remove them.

Bug: 154143053
Test: xaacdec

Change-Id: I5f7722b6e045031df0f37279441946f014953443
2020-04-18 08:10:37 -07:00
Sushanth Patil
0708a5228b Optimisation changes in saturation functions
Changed saturation logic in ixheaacd_add32_sat()
and ixheaacd_sub32_sat() functions.

Bug: 154143053
Test: xaacdec

Change-Id: I2281954a18487c05894b8f5e9b76d1290c943b82
2020-04-15 13:06:33 -07:00
Xin Li
685347bc6b [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 262ffafc32 -s ours
am skip reason: subject contains skip directive

Change-Id: I10550b9e86c7845bb2c7e03fb05b722a4ad26cba
2020-04-10 03:17:09 +00:00
Xin Li
262ffafc32 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: Idd8a0e3c6150421a3ebf3a0e296937538e497cc0
2020-04-09 17:50:47 -07:00
Ray Essick
17e19a1f7c Typos: persistant -> persistent am: 45895b998a
Change-Id: I1c5c00a5f9919acc9fd19c16d5e07dc880447c0a
2020-04-02 19:32:55 +00:00
Tripti Tiwari
5fb0c7bea3 Fix for Segv in impd_down_mix function in xaac. am: 72b91f378a
Change-Id: Ieac4fd6e40a4006630729bb704bdfc43675cedb4
2020-04-02 19:32:53 +00:00
Ray Essick
45895b998a Typos: persistant -> persistent
Bug: 141290162
Test: build
Change-Id: I204e2a069cc306736f2a6e2dbc92b132a5c919ef
2020-04-02 09:04:46 -07:00
Tripti Tiwari
72b91f378a Fix for Segv in impd_down_mix function in xaac.
Enough size was not allocated for DRC payload.
Added appropriate size to persistence memory to accommodate maximum
length of DRC payload data. Also added reset for bit-handler elements
after execute call.

Bug:141290162
Test: poc in bug

Change-Id: I61176076056899310a3306818cd5ad4624a4bab0
2020-04-02 09:00:29 -07:00
TreeHugger Robot
a9ef6fb80f Merge "Fix for infinite loop in impd_apply_gains_and_add function" into rvc-dev am: dd0c4f77d0
Change-Id: I6519426e2e19897f6a6b907b023cd57190e7205e
2020-04-02 04:05:08 +00:00
TreeHugger Robot
dd0c4f77d0 Merge "Fix for infinite loop in impd_apply_gains_and_add function" into rvc-dev 2020-04-02 03:45:45 +00:00
Rajat Kumar
dc9da8722e Fix for OOB in external libxaac am: 57b4f3eac4
Change-Id: I6ad790165504b15373184270d0f0840a56253e49
2020-04-02 03:34:18 +00:00
Rajat Kumar
57b4f3eac4 Fix for OOB in external libxaac
Codec initialization is done with AOT 2 (AAC-LC profile),
but AOT changes abruptly to 42 (USAC profile) in execution
leading to access of uninitialized tables. Hence Added a
check for mismatch in AOT during initialization and
AOT during execution.

Bug:150400335
Test: poc in bug

Change-Id: I73ca2bf0f963df7982c1a8371a8fc0c2e3c7cd82
2020-03-29 17:16:45 -07:00
Rajat Kumar
fdeb26a3f5 Fix for infinite loop in impd_apply_gains_and_add function
if (iEnd == iStart) is true until end line of loop,
and (drc_gain_last == shape_filter_block[g].drc_gain_last)
is also true, this make iEnd unchanged for ever
and the while loop will go into infinite iterations.
Hence added a check to break for the same.

Bug:148433653
Bug:151817831
Test:poc in bug

Change-Id: I2a59cde98abee0f28510a5b50ef44b3efd02c079
2020-03-29 17:08:20 -07:00
TreeHugger Robot
439c0bdf9e Merge "Fix for array out of bound in decoder/drc_src/impd_drc_eq.c" into rvc-dev am: 7862de4bd2
Change-Id: I48739026f3e79803a9e63149d4ea02be7971002c
2020-03-19 19:24:34 +00:00
TreeHugger Robot
7862de4bd2 Merge "Fix for array out of bound in decoder/drc_src/impd_drc_eq.c" into rvc-dev 2020-03-19 19:07:47 +00:00
Xin Li
dbac3acf47 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 17570befa3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4330815dd4b2c702c2596d722bea302028cf18ec
2020-03-19 04:26:02 +00:00
Xin Li
4ad9ba0fdc DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 17570befa3
Change-Id: If96278f65864f00a6fc6f0416da298b72b6576dd
2020-03-19 04:20:00 +00:00
Xin Li
17570befa3 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Bug: 151763422
Change-Id: Iad5dbf0139aac64725c98d86c9b98a8189e2bc47
2020-03-18 19:40:38 -07:00
Sushanth Patil
40fb6f798f Fix for array out of bound in decoder/drc_src/impd_drc_eq.c
Error return check was missing, which caused an
unchecked value to propagate and lead to array OOB.

Bug: 151407605
Test: poc in bug

Change-Id: I0ab9ced7504314e0a31fbe7138c0b95ecbc8cd84
2020-03-18 20:56:48 +00:00
Rajat Kumar
e0e06a4675 Fix for array out of bound for type 'ia_filt_cascade_td_struct[4]' am: ed2dbffd88
Change-Id: Ibca74a941c7e94ccc7fc469ed03de5f5e4c2aca3
2020-03-18 18:17:51 +00:00
Rajat Kumar
ed2dbffd88 Fix for array out of bound for type 'ia_filt_cascade_td_struct[4]'
Value is read from the bit stream and used as index
before checking for bounds, added the same as fix here.

Bug: 151412914
Test: poc in bug

Change-Id: I2f484398d87bee0a525e4f31b4f0da4c1b13bb1d
2020-03-18 09:09:45 -07:00
Automerger Merge Worker
b8d50dbc3a Merge "Fix for missing bound check in MPS bit parsing" into rvc-dev am: 418325e543
Change-Id: I90acb99a26a8b6d6911c51f1e8a4114cf4d49ec9
2020-03-10 05:13:52 +00:00
TreeHugger Robot
418325e543 Merge "Fix for missing bound check in MPS bit parsing" into rvc-dev 2020-03-10 04:51:59 +00:00
Automerger Merge Worker
05c0158bfb Remove mips workarounds. am: a4398eccb8 am: 1e1ae5bdbf
Change-Id: I41e3ca1bfa0e8b9f41ed82b6a6451e1d5e0a58f5
2020-03-10 00:34:53 +00:00
Automerger Merge Worker
c7ab425cb7 Remove mips workarounds. am: a4398eccb8 am: 1e1ae5bdbf
Change-Id: I6a3885975c9d16551afe9a9bc4bf8c384e0fc741
2020-03-10 00:34:47 +00:00