aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f ↵Kris Alder2020-04-0915-11/+201
|\ | | | | | | | | | | am: 0f130d51b8 Change-Id: Id0ab338ed4f6cce21e4983bd2903faa56eadc51b
| * Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731fKris Alder2020-04-0915-11/+201
|/| | | | | | | Change-Id: Ie5c84f6923184c564793de5e5f0007bc197415e7
| * Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400Kris Alder2020-04-0915-11/+201
| |\ | | | | | | | | | Change-Id: Id2c7f9213d42db6897c3d8cc1fd14c0126fb8bb1
| | * Merge changes Iad37ae76,I4870251b,Icd937cadKris Alder2020-04-0915-11/+201
| |/| | | | | | | | | | | | | | | | | | | * changes: Added aac_dec_fuzzer aacdec: Add host support Stop using __DATE__/__TIME__ on all builds
| | * Added aac_dec_fuzzerAnuj Joshi2020-03-273-0/+182
| | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 151595970 Change-Id: Iad37ae766288e9490520d858a6de0dd755e70681
| | * aacdec: Add host supportAnuj Joshi2020-03-271-0/+7
| | | | | | | | | | | | | | | | | | | | | Test: Build libFraunhoferAAC on host Bug: 151595970 Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c
| | * Stop using __DATE__/__TIME__ on all buildsAnuj Joshi2020-03-2712-11/+12
| |/ | | | | | | | | | | | | Test: mmma external/libaac Bug: 151595970 Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
* | 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
* | 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
* | 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
* | 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
* | 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
* | 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
* | | 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
* | 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
* | 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
* | Revise scaling for USAC combined with phase coding in SpatialDecApplyM2() to ↵Fraunhofer IIS FDK2020-01-142-66/+84
| | | | | | | | | | | | | | | | prevent signed integer overflow. Bug: 146937759 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: If7c484b2e1bee82747f5c6dc0ee7ad1f282c0189
* | Avoid signed integer overflows in SpatialDecApplyParameterSets() when adding ↵Fraunhofer IIS FDK2020-01-141-7/+9
| | | | | | | | | | | | | | | | dry and wet signal. Bug: 146936964 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Idb4242d54b2e61805ab071a8977eed8f06081edf
* | Introduce scaling in FDKhybridSynthesisApply() to avoid potential signed ↵Fraunhofer IIS FDK2020-01-141-16/+18
| | | | | | | | | | | | | | | | integer overflow. Bug: 146937225 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ifa3d157a842828c2a66694d95dad5d4992ff6d87
* | Prevent signed integer overflow in fMultIceil() for case m_e=-31.Fraunhofer IIS FDK2020-01-141-5/+10
| | | | | | | | | | | | Bug: 146934600 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8a67a3b17f3ec3af753b6463b72ae2947986b39c
* | Merge "Revert "Add TEST_MAPPING for aac project""Jean-Michel Trivi2020-01-031-22/+0
|\ \
| * | Revert "Add TEST_MAPPING for aac project"Jean-Michel Trivi2020-01-031-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b10c18741e961015fbded7df2bbf0ec5f799de9e. Reason for revert: cf_x86_phone-userdebug breaks on those tests Bug: 147097191 Change-Id: I15eccdc2a8527f526882dc6e5df241f404cb163d
* | | Merge "Add TEST_MAPPING for aac project"Jean-Michel Trivi2019-12-301-0/+22
|\| |
| * | Add TEST_MAPPING for aac projectJean-Michel Trivi2019-12-271-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a TEST_MAPPING file for this project so every change runs all the CTS decoding tests as presubmit. Alternatively this can be used as a convenient way to run all AAC tests in one command. Test: [from root] atest --test-mapping external/aac/ Test: [from external/aaac] atest Change-Id: Ic03753b57bb1d3b6a06ced1fd7f321bf8402e8cf
* | | Fix for OPD smoothing in USAC decoder.Fraunhofer IIS FDK2019-12-271-0/+4
| | | | | | | | | | | | | | | | | | Bug: 145668878 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I075e3230d53c5a848f93541a9918c5bfaf2df725