summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix to handle segv in impd_filter_banks_process"HEADmasterRay Essick2020-09-301-0/+2
|\
| * Fix to handle segv in impd_filter_banks_processRajat kumar2020-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt"Treehugger Robot2020-09-302-5/+5
|\ \
| * | Fix for integer overflow in ixheaacd_cplx_synt_qmffiltRajat Kumar2020-09-112-5/+5
| |/ | | | | | | | | | | | | | | | | Added saturation checks to avoid integer overflow. Bug: 158398386 Test: poc in bug Change-Id: Ib4f10e07a4c6069452d38e87413fac755c056bae
* | Merge "Fix for NPD in ixheaacd_init_sbr"Treehugger Robot2020-09-302-2/+2
|\ \
| * | Fix for NPD in ixheaacd_init_sbrRajat Kumar2020-09-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Fix for array out of bound access in impd_drc_get_gain"Ray Essick2020-09-301-4/+8
|\ \ \ | |/ / |/| |
| * | Fix for array out of bound access in impd_drc_get_gainRajat kumar2020-09-111-4/+8
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Include a shared media team OWNERS for easier management"Treehugger Robot2020-09-161-2/+2
|\ \
| * | Include a shared media team OWNERS for easier managementRay Essick2020-09-151-2/+2
| | | | | | | | | | | | | | | | | | Bug: 162786146 Test: n Change-Id: If329fabafe0a1f46ecd9e31cb17a1d2c716aa3d2
* | | Fix for Null-dereference read in ixheaacd_init_sbrRajat Kumar2020-09-111-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix to handle missing checks on error returnedRajat Kumar2020-09-1068-802/+780
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge Android RXin Li2020-09-08156-5584/+2805
|\ \ | | | | | | | | | | | | | | | Bug: 168057903 Merged-In: Ice88af6abbaec9ae277a56fcf7df516ba2e9486f Change-Id: Id25da2bf82cd73fddf16c439f775d8f085ebec30
| * \ Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into ↵Xin Li2020-09-01156-5584/+2805
| |\ \ | | | | | | | | | | | | stage-aosp-master
| | * \ Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-27156-5584/+2805
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: I67a2f4be536fd22a9cc615088ce6368223311cf2 Change-Id: Iea753fbdfd54db2a0c5499ca481767192ccc55ca
| | | * \ Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2acKris Alder2020-06-051-0/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1318980 Change-Id: I67a2f4be536fd22a9cc615088ce6368223311cf2
| | | * \ \ point to new repo hooks for mainline uploads am: 9087c50905Ray Essick2020-05-291-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a514cd955ef723b09645309a6b6dc017030d67a
| | | | * | | point to new repo hooks for mainline uploadsandroid11-devRay Essick2020-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: I6c597f289e4953b43cdbd683d633a90bd5bb9bc9
| | | * | | | Fix for build errors with -Wunreachable-code-loop-increment flag am: ↵Rajat Kumar2020-05-152-59/+52
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 750dd58c8d am: ce1b551e99 Change-Id: I0bfff50cf05734d3033f9ac9581807f44c05b6e4
| | | * \ \ \ \ Add METADATA to libxaac: Apache2=NOTICE am: b674a33043 am: c451737b56Bob Badour2020-05-011-0/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8bcd94c144ae6bd8ca9129a1c8f91f8d153d204
| | | * \ \ \ \ \ Optimisation changes in ixheaacd_samples_sat am: 92bec05d2dSushanth Patil2020-04-232-16/+19
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | Change-Id: I353d26eb67c8a26b213c348aeda564715ab7252f
| | | | * | | | | Optimisation changes in ixheaacd_samples_satSushanth Patil2020-04-182-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Optimisation changes in esbr synthesis filter block am: 05c7402a06Sushanth Patil2020-04-231-74/+74
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8791cb7f5088575ea5af009ed881e2c8ef0bf6f3
| | | | * | | | | Optimisation changes in esbr synthesis filter blockSushanth Patil2020-04-181-74/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some computation were not required when mps and sbr are present. Added a check to remove them. Bug: 154143053 Test: xaacdec Change-Id: I5f7722b6e045031df0f37279441946f014953443
| | | * | | | | | Optimisation changes in saturation functions am: 0708a5228bSushanth Patil2020-04-221-10/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0be0ffb617d90ecac6b457305e0add28ebb360d
| | | | * | | | | Optimisation changes in saturation functionsSushanth Patil2020-04-151-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed saturation logic in ixheaacd_add32_sat() and ixheaacd_sub32_sat() functions. Bug: 154143053 Test: xaacdec Change-Id: I2281954a18487c05894b8f5e9b76d1290c943b82
| | | * | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 262ffafc32 -s ours am skip reason: subject contains skip directive Change-Id: I10550b9e86c7845bb2c7e03fb05b722a4ad26cba
| | | * \ \ \ \ \ \ Typos: persistant -> persistent am: 45895b998aRay Essick2020-04-023-47/+47
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | Change-Id: I1c5c00a5f9919acc9fd19c16d5e07dc880447c0a
| | | | * | | | | | Typos: persistant -> persistentRay Essick2020-04-023-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 141290162 Test: build Change-Id: I204e2a069cc306736f2a6e2dbc92b132a5c919ef
| | | * | | | | | | Fix for Segv in impd_down_mix function in xaac. am: 72b91f378aTripti Tiwari2020-04-024-6/+26
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieac4fd6e40a4006630729bb704bdfc43675cedb4
| | | | * | | | | | Fix for Segv in impd_down_mix function in xaac.Tripti Tiwari2020-04-024-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | Merge "Fix for infinite loop in impd_apply_gains_and_add function" into ↵TreeHugger Robot2020-04-021-0/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-dev am: dd0c4f77d0 Change-Id: I6519426e2e19897f6a6b907b023cd57190e7205e
| | | | * | | | | | Merge "Fix for infinite loop in impd_apply_gains_and_add function" into rvc-devTreeHugger Robot2020-04-021-0/+3
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix for infinite loop in impd_apply_gains_and_add functionRajat Kumar2020-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | Fix for OOB in external libxaac am: 57b4f3eac4Rajat Kumar2020-04-022-1/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ad790165504b15373184270d0f0840a56253e49
| | | | * | | | | | | Fix for OOB in external libxaacRajat Kumar2020-03-292-1/+9
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | Merge "Fix for array out of bound in decoder/drc_src/impd_drc_eq.c" into ↵TreeHugger Robot2020-03-191-3/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-dev am: 7862de4bd2 Change-Id: I48739026f3e79803a9e63149d4ea02be7971002c
| | | | * | | | | | Merge "Fix for array out of bound in decoder/drc_src/impd_drc_eq.c" into rvc-devTreeHugger Robot2020-03-191-3/+5
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix for array out of bound in decoder/drc_src/impd_drc_eq.cSushanth Patil2020-03-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 17570befa3 -s ours am skip reason: subject contains skip directive Change-Id: I4330815dd4b2c702c2596d722bea302028cf18ec
| | | * \ \ \ \ \ \ \ \ Fix for array out of bound for type 'ia_filt_cascade_td_struct[4]' am: ↵Rajat Kumar2020-03-181-16/+14
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed2dbffd88 Change-Id: Ibca74a941c7e94ccc7fc469ed03de5f5e4c2aca3
| | | | * | | | | | | | Fix for array out of bound for type 'ia_filt_cascade_td_struct[4]'Rajat Kumar2020-03-181-16/+14
| | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | Merge "Fix for missing bound check in MPS bit parsing" into rvc-dev am: ↵Automerger Merge Worker2020-03-105-8/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 418325e543 Change-Id: I90acb99a26a8b6d6911c51f1e8a4114cf4d49ec9
| | | | * | | | | | | Merge "Fix for missing bound check in MPS bit parsing" into rvc-devTreeHugger Robot2020-03-105-8/+13
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix for missing bound check in MPS bit parsingRajat Kumar2020-03-055-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value of bs_decorr_config = 3 is not supported. A check has been added for the same. Bug: 136063852 Test: manual review Change-Id: Idd2309e9d0f6d346fb5c9227bed1124d622e6f7e
| | | * | | | | | | | | Remove mips workarounds. am: a4398eccb8 am: 1e1ae5bdbfAutomerger Merge Worker2020-03-101-24/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a3885975c9d16551afe9a9bc4bf8c384e0fc741
| | | * \ \ \ \ \ \ \ \ \ Merge "Fix for SEGV in ixheaacd_aacdec_decodeframe function." into rvc-dev ↵Automerger Merge Worker2020-03-092-7/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4bbb59d953 Change-Id: I686cbb29d1801ed8641253c1099cbbd566bc603f
| | | | * | | | | | | | | Merge "Fix for SEGV in ixheaacd_aacdec_decodeframe function." into rvc-devTreeHugger Robot2020-03-092-7/+8
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix for SEGV in ixheaacd_aacdec_decodeframe function.Tripti Tiwari2020-03-072-7/+8
| | | | | | |/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For erroneous stream, coupling channel initialization memory was overlapping with SBR scratch memory usage, causing unwanted reset of the some of the pointers. All initialization should take place in persistent memory. As a fix, replaced scratch with persistent memory for initialization. Bug:145264510 Test:poc in bug Change-Id: Iaa757d0e87fd3a0b2f75c5288cfe662f556c871f
| | | * | | | | | | | | | Merge "Fix for read buffer overflow in impd_filter_banks_process" into ↵Automerger Merge Worker2020-03-091-3/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-dev am: 3eb739ab1d Change-Id: Iaeb045a93a1113b2cc4f9f34c424f89af87efbd6