aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, ↵android-build-team Robot2020-09-161-6/+6
|\ | | | | | | | | | | 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
| * Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-161-6/+6
|/ | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e (cherry picked from commit bb8f983bf36ee2ad8af6acebf4823a58060004ab)
* Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-releaseandroid-build-team Robot2020-05-301-0/+2
|\ | | | | | | Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
| * point to new repo hooks for mainline uploadsRay Essick2020-05-261-0/+2
| | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
* | Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-releaseandroid-build-team Robot2020-05-121-0/+7
|\| | | | | | | Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
| * Set min_sdk_version to be part of mainline modulesJooyung Han2020-05-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 152655956 Test: m Merged-In: I662ad951a3221f967b53e7af65cb203a4b4a5e5d Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d (cherry picked from commit d40f05a61897c4ba746dd2b383fff0c158026c1f)
* | Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-releaseandroid-build-team Robot2020-02-164-24/+3
|\| | | | | | | Change-Id: I1d56321205dbd74479a72ecbbde137a18eef044b
| * Remove outdated apply_normalization parameter from legacy DRC module.Fraunhofer IIS FDK2020-02-144-24/+3
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9b894007fc9d80da6aaee09d84c2b356f2c06ff7
* | Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-releaseandroid-build-team Robot2020-02-1559-904/+1111
|\| | | | | | | Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
| * Avoid decoder internal clipping by converting the whole audio sample data ↵Fraunhofer IIS FDK2020-02-1441-442/+488
| | | | | | | | | | | | | | | | path from 16 to 32 bit data width (FDKdec v3.2.0). Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I8a504ab709e42e27a61fe29840212953742283a5
| * Create new applyDrcLevelNormalization() function for subsequent usage.Fraunhofer IIS FDK2020-02-143-2/+222
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I23cc3081ff71830bc96766a31131594499dbdd04
| * Revise memory overlay usage and remove deprecated buffers and overlay tags.Fraunhofer IIS FDK2020-02-145-30/+9
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I7aea2898a3c49e06209fae89d734939c100e1184
| * Restructure QMF implementation and provide 16/32 bit implementation in parallel.Fraunhofer IIS FDK2020-02-145-373/+318
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I2c6b332a0b5c4966a3f680d7a4d562d9bf18752c
| * Enhance encoder audio quality for vbr (FDKenc v4.0.1).Fraunhofer IIS FDK2020-02-136-48/+36
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I4af82bd104a94710d1977eaa0bd086aa743d3adf
| * Improve encoder audio quality for low bitreservoir configuration.Fraunhofer IIS FDK2020-02-131-4/+7
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I87d5695a93b1f130b95b45d48157e6aaf947709d
| * Fix SBR encoder element mapping for channel configurations with more than ↵Fraunhofer IIS FDK2020-02-131-1/+27
| | | | | | | | | | | | | | | | one layer Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I8cd9e7f9aaeb62629f916f8d0dba7422d9a5e878
| * Ensure that QC_OUT_CHANNEL struct in encoder always uses aligned memoryFraunhofer IIS FDK2020-02-132-4/+4
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: Ifc513ef20639f04c7252ade5519cc8e8c2fdbd50
* | Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-releaseandroid-build-team Robot2020-02-144-104/+53
|\| | | | | | | Change-Id: Ide088e86f1ced06e7717f8d78d187058bc7db370
| * Revise and straighten out pointless description from encoder documentationFraunhofer IIS FDK2020-02-132-32/+9
| | | | | | | | | | | | Bug: 149481606 Test: header doc update, so just make Change-Id: If5c7fcf96f97a3a1e8ee06bd24fb247c094508bd
| * Revise and straighten out useless references from decoder documentation.Fraunhofer IIS FDK2020-02-132-72/+44
| | | | | | | | | | | | Bug: 149481606 Test: doc update in header, so just make Change-Id: I656e76762ee336931d4f1938e5c39c8ad7f65954
* | Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-releaseandroid-build-team Robot2020-02-138-19/+71
|\| | | | | | | Change-Id: Iefbacc1498ce7caf6c6ccb2df4c8b4c6cca4ab76
| * Extend decoder API with audio output loudness info (FDKdec v3.1.3).Fraunhofer IIS FDK2020-02-118-19/+71
| | | | | | | | | | | | Bug: 148385721 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I68b09883def21baef259c9ab914922567ab8cee3
* | Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-releaseandroid-build-team Robot2020-01-282-5/+5
|\| | | | | | | Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
| * Merge "Request for Expert and Anchor loudness by default."Jean-Michel Trivi2020-01-271-2/+2
| |\
| | * Request for Expert and Anchor loudness by default.Fraunhofer IIS FDK2020-01-271-2/+2
| | | | | | | | | | | | | | | | | | Bug: 148385721 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I06b116b7d144b6959705119908a9db27946a0adb
| * | Fix AACDEC_INTR handling for USAC configuration with multiple pre-roll AUsFraunhofer IIS FDK2020-01-271-3/+3
| |/ | | | | | | | | | | Bug: 148384920 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I88cd6da0b18c73f7b521ea58ba8b8f364278b64f
* | Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-releaseandroid-build-team Robot2020-01-248-33/+169
|\| | | | | | | Change-Id: Icd800c3d313c30fc67595fc70baaf69b12188cd7
| * Do not allow channel configuration change within PCE for ADTS. Fixes assert.Fraunhofer IIS FDK2020-01-232-2/+41
| | | | | | | | | | | | | | Bug: 146938557 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Icba99bd0eeba1f94298bdd08b85f1b0cb3cf241b
| * Avoid negative valid bits in adtsRead_DecodeHeader()Fraunhofer IIS FDK2020-01-231-2/+8
| | | | | | | | | | | | | | | | | | Avoid negative valid bits in adtsRead_DecodeHeader() and prevent unsigned integer overflow. Bug: 146937602 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I264ff99e0461352ae5c2b2031393b67a7fa44571
| * Merge "Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC ↵TreeHugger Robot2020-01-221-7/+32
| |\ | | | | | | | | | streams containing legacy DRC info."
| | * Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams ↵Fraunhofer IIS FDK2020-01-221-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | containing legacy DRC info. Bug: 146937553 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I1a23d986160c1de07a7159ac026f57d821d3ff1d
| * | Merge "Perform sanity check on DRC sets and improve the selection process"Jean-Michel Trivi2020-01-225-22/+88
| |\ \ | | |/ | |/|
| | * Perform sanity check on DRC sets and improve the selection processFraunhofer IIS FDK2020-01-225-22/+88
| | | | | | | | | | | | | | | | | | | | | Bug: 137282770 Bug: 141883493 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie8e17c82653cb0d9adcdb10ec3f4875b6207ac6f
* | | Snap for 6154573 from cedcc475f52dd704497524dda6ec2ef430d2b6c5 to rvc-releaseandroid-build-team Robot2020-01-233-3/+12
|\| | | | | | | | | | | Change-Id: I6edb0ebedba940eb136ae37bed4e010ee76f3d58
| * | Reject undefined fPow() input data in _compressorIO_sigmoid_common().Fraunhofer IIS FDK2020-01-221-1/+4
| | | | | | | | | | | | | | | | | | Bug: 146938418 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iae4730ab5f5cef7c0ac8830831d25cfcaa567a99
| * | Avoid undefined shift exponent in f2Pow().Fraunhofer IIS FDK2020-01-222-2/+8
| |/ | | | | | | | | | | Bug: 146938418 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Id28608e049244968158900848c23bf7a8298083d
* | Snap for 6145313 from cee316ab3ebde92047b5e76d15c00768b92cb890 to rvc-releaseandroid-build-team Robot2020-01-183-28/+19
|\| | | | | | | Change-Id: I642e8bbffa03f9c9e718eb115125c1e0fa852556
| * Fix too large shift exponent in CConcealment_InterpolateBuffer().Fraunhofer IIS FDK2020-01-161-8/+3
| | | | | | | | | | | | Bug: 146938361 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Idb0a4e2c87962e453a991f0a573155ace6e9bf40
| * Prevent too large shift exponents in SpatialDecReshapeBBEnv().Fraunhofer IIS FDK2020-01-161-9/+14
| | | | | | | | | | | | Bug: 146937858 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I9fbe0b364ae4d329c6e5cc1109a111ef5def552d
| * Avoid too large shift exponent in apply_inter_tes() by using fIsLessThan.Fraunhofer IIS FDK2020-01-161-11/+2
| | | | | | | | | | | | Bug: 146936613 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8414072929ec8f786e0c003f18ab453dbacb9e5e
* | Snap for 6142138 from 1020e48d6e76506ac85a7678fe950ce7245d3aea to rvc-releaseandroid-build-team Robot2020-01-177-157/+138
|\| | | | | | | Change-Id: Icb323d1007194553c9b7494024ae7fab252696ee
| * Fix IsLessThan() function for certain edge cases.Fraunhofer IIS FDK2020-01-161-0/+26
| | | | | | | | | | | | Bug: 146936613 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Idbec38c1df01bd7a6a48ac4b6e5673c30627fc73
| * Avoid unsigned integer overflows in FDK_Feed().Fraunhofer IIS FDK2020-01-161-3/+6
| | | | | | | | | | | | Bug: 146937030 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I7bd63c2fbfed2612c80d3334d1339e1cd215e034
| * Prevent undefined syncLayerFrameBits in synchronization().Fraunhofer IIS FDK2020-01-141-2/+6
| | | | | | | | | | | | Bug: 146937540 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Idaaa11d95c13220a9f96e6d73d4813492a740954
| * Avoid unsigned integer overflow in transportDec_InBandConfig() and ↵Fraunhofer IIS FDK2020-01-141-2/+3
| | | | | | | | | | | | | | | | transportDec_ReadAccessUnit(). Bug: 146937857 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: If2320f3a1ddf6a36c07338100481801a996e455d
| * Prevent negation of INT_MIN in CConcealment_ApplyRandomSign().Fraunhofer IIS FDK2020-01-141-2/+2
| | | | | | | | | | | | Bug: 146937601 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I9747110eca96b37604df996ef5e86ea58e2d8932
| * Revise scaling in extractBBEnv() to avoid potential signed integer overflows.Fraunhofer IIS FDK2020-01-141-106/+68
| | | | | | | | | | | | Bug: 146936823 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I268f4ed2778ffad6cbd90e1df627daf2eab97604
| * Avoid signed integer overflow in combineSignalCplx*().Fraunhofer IIS FDK2020-01-141-31/+10
| | | | | | | | | | | | Bug: 146937324 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I3f5516085483ac349f9873e7267c6ff7f9c6f816
| * Prevent signed integer overflow in TsdApply().Fraunhofer IIS FDK2020-01-141-11/+17
| | | | | | | | | | | | Bug: 146937678 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ia7b58caf9eb86c19e3ae10b3cc624490b2a5f07b
* | Snap for 6138855 from 063d5f30864c6293855da6f7b8dd482d7c408158 to rvc-releaseandroid-build-team Robot2020-01-165-94/+121
|\| | | | | | | Change-Id: I76b653e2aa437267603833e7fade774c4d210243