Kris Alder
662d974400
Merge changes Iad37ae76,I4870251b,Icd937cad
...
* changes:
Added aac_dec_fuzzer
aacdec: Add host support
Stop using __DATE__/__TIME__ on all builds
2020-04-09 16:19:32 +00:00
Anuj Joshi
d41cddf9e9
Added aac_dec_fuzzer
...
Test: ./aac_dec_fuzzer
Bug: 151595970
Change-Id: Iad37ae766288e9490520d858a6de0dd755e70681
2020-03-27 11:11:27 +05:30
Anuj Joshi
b09c5ae9f0
aacdec: Add host support
...
Test: Build libFraunhoferAAC on host
Bug: 151595970
Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c
2020-03-27 11:09:30 +05:30
Anuj Joshi
7f7bbce892
Stop using __DATE__/__TIME__ on all builds
...
Test: mmma external/libaac
Bug: 151595970
Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
2020-03-27 10:43:38 +05:30
Fraunhofer IIS FDK
261fadc3a2
Remove outdated apply_normalization parameter from legacy DRC module.
...
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9b894007fc9d80da6aaee09d84c2b356f2c06ff7
2020-02-14 10:56:10 -08:00
Fraunhofer IIS FDK
e016635f0d
Avoid decoder internal clipping by converting the whole audio sample data path from 16 to 32 bit data width (FDKdec v3.2.0).
...
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I8a504ab709e42e27a61fe29840212953742283a5
2020-02-14 10:53:51 -08:00
Fraunhofer IIS FDK
57c9355de0
Create new applyDrcLevelNormalization() function for subsequent usage.
...
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I23cc3081ff71830bc96766a31131594499dbdd04
2020-02-14 10:47:19 -08:00
Fraunhofer IIS FDK
90c29e0808
Revise memory overlay usage and remove deprecated buffers and overlay tags.
...
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I7aea2898a3c49e06209fae89d734939c100e1184
2020-02-14 10:44:10 -08:00
Fraunhofer IIS FDK
5482443193
Restructure QMF implementation and provide 16/32 bit implementation in parallel.
...
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I2c6b332a0b5c4966a3f680d7a4d562d9bf18752c
2020-02-14 08:51:24 -08:00
Fraunhofer IIS FDK
443d38963e
Enhance encoder audio quality for vbr (FDKenc v4.0.1).
...
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I4af82bd104a94710d1977eaa0bd086aa743d3adf
2020-02-13 14:58:49 -08:00
Fraunhofer IIS FDK
79305e068e
Improve encoder audio quality for low bitreservoir configuration.
...
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I87d5695a93b1f130b95b45d48157e6aaf947709d
2020-02-13 14:48:27 -08:00
Fraunhofer IIS FDK
6b0aab087d
Fix SBR encoder element mapping for channel configurations with more than one layer
...
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I8cd9e7f9aaeb62629f916f8d0dba7422d9a5e878
2020-02-13 14:41:18 -08:00
Fraunhofer IIS FDK
7b5389e63f
Ensure that QC_OUT_CHANNEL struct in encoder always uses aligned memory
...
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: Ifc513ef20639f04c7252ade5519cc8e8c2fdbd50
2020-02-13 14:39:47 -08:00
Fraunhofer IIS FDK
925092e8fc
Revise and straighten out pointless description from encoder documentation
...
Bug: 149481606
Test: header doc update, so just make
Change-Id: If5c7fcf96f97a3a1e8ee06bd24fb247c094508bd
2020-02-13 09:07:40 -08:00
Fraunhofer IIS FDK
1d451971ca
Revise and straighten out useless references from decoder documentation.
...
Bug: 149481606
Test: doc update in header, so just make
Change-Id: I656e76762ee336931d4f1938e5c39c8ad7f65954
2020-02-13 08:59:36 -08:00
Fraunhofer IIS FDK
31f66f6d3f
Extend decoder API with audio output loudness info (FDKdec v3.1.3).
...
Bug: 148385721
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I68b09883def21baef259c9ab914922567ab8cee3
2020-02-11 16:02:32 -08:00
Jean-Michel Trivi
3255d513ce
Merge "Request for Expert and Anchor loudness by default."
2020-01-27 21:58:24 +00:00
Fraunhofer IIS FDK
7d437ef090
Request for Expert and Anchor loudness by default.
...
Bug: 148385721
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I06b116b7d144b6959705119908a9db27946a0adb
2020-01-27 11:34:17 -08:00
Fraunhofer IIS FDK
00285819a2
Fix AACDEC_INTR handling for USAC configuration with multiple pre-roll AUs
...
Bug: 148384920
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I88cd6da0b18c73f7b521ea58ba8b8f364278b64f
2020-01-27 09:21:21 -08:00
Fraunhofer IIS FDK
f04a8a855c
Do not allow channel configuration change within PCE for ADTS. Fixes assert.
...
Bug: 146938557
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Icba99bd0eeba1f94298bdd08b85f1b0cb3cf241b
2020-01-23 12:24:56 -08:00
Fraunhofer IIS FDK
262c9f28ec
Avoid negative valid bits in adtsRead_DecodeHeader()
...
Avoid negative valid bits in adtsRead_DecodeHeader()
and prevent unsigned integer overflow.
Bug: 146937602
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I264ff99e0461352ae5c2b2031393b67a7fa44571
2020-01-23 09:48:54 -08:00
TreeHugger Robot
814859ba72
Merge "Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams containing legacy DRC info."
2020-01-22 23:18:35 +00:00
Jean-Michel Trivi
44b9543d92
Merge "Perform sanity check on DRC sets and improve the selection process"
2020-01-22 22:57:04 +00:00
Fraunhofer IIS FDK
7388c0732d
Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams containing legacy DRC info.
...
Bug: 146937553
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I1a23d986160c1de07a7159ac026f57d821d3ff1d
2020-01-22 14:13:51 -08:00
Fraunhofer IIS FDK
cedcc475f5
Reject undefined fPow() input data in _compressorIO_sigmoid_common().
...
Bug: 146938418
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iae4730ab5f5cef7c0ac8830831d25cfcaa567a99
2020-01-22 11:59:29 -08:00
Fraunhofer IIS FDK
e323bf6cab
Avoid undefined shift exponent in f2Pow().
...
Bug: 146938418
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Id28608e049244968158900848c23bf7a8298083d
2020-01-22 11:59:08 -08:00
Fraunhofer IIS FDK
3ce7751a44
Perform sanity check on DRC sets and improve the selection process
...
Bug: 137282770
Bug: 141883493
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie8e17c82653cb0d9adcdb10ec3f4875b6207ac6f
2020-01-22 11:11:56 -08:00
Fraunhofer IIS FDK
cee316ab3e
Fix too large shift exponent in CConcealment_InterpolateBuffer().
...
Bug: 146938361
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idb0a4e2c87962e453a991f0a573155ace6e9bf40
2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
86f7d2b69a
Prevent too large shift exponents in SpatialDecReshapeBBEnv().
...
Bug: 146937858
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9fbe0b364ae4d329c6e5cc1109a111ef5def552d
2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
5d09563196
Avoid too large shift exponent in apply_inter_tes() by using fIsLessThan.
...
Bug: 146936613
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8414072929ec8f786e0c003f18ab453dbacb9e5e
2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
1020e48d6e
Fix IsLessThan() function for certain edge cases.
...
Bug: 146936613
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idbec38c1df01bd7a6a48ac4b6e5673c30627fc73
2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
e3b9058b8b
Avoid unsigned integer overflows in FDK_Feed().
...
Bug: 146937030
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I7bd63c2fbfed2612c80d3334d1339e1cd215e034
2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
8fee7605df
Prevent undefined syncLayerFrameBits in synchronization().
...
Bug: 146937540
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idaaa11d95c13220a9f96e6d73d4813492a740954
2020-01-14 16:39:37 -08:00
Fraunhofer IIS FDK
8caa63f329
Avoid unsigned integer overflow in transportDec_InBandConfig() and transportDec_ReadAccessUnit().
...
Bug: 146937857
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: If2320f3a1ddf6a36c07338100481801a996e455d
2020-01-14 16:38:28 -08:00
Fraunhofer IIS FDK
9ab63ce151
Prevent negation of INT_MIN in CConcealment_ApplyRandomSign().
...
Bug: 146937601
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9747110eca96b37604df996ef5e86ea58e2d8932
2020-01-14 14:53:43 -08:00
Fraunhofer IIS FDK
3070b0e81b
Revise scaling in extractBBEnv() to avoid potential signed integer overflows.
...
Bug: 146936823
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I268f4ed2778ffad6cbd90e1df627daf2eab97604
2020-01-14 14:52:18 -08:00
Fraunhofer IIS FDK
ed5a207a1f
Avoid signed integer overflow in combineSignalCplx*().
...
Bug: 146937324
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3f5516085483ac349f9873e7267c6ff7f9c6f816
2020-01-14 14:50:26 -08:00
Fraunhofer IIS FDK
1a0335287f
Prevent signed integer overflow in TsdApply().
...
Bug: 146937678
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia7b58caf9eb86c19e3ae10b3cc624490b2a5f07b
2020-01-14 14:49:15 -08:00
Fraunhofer IIS FDK
063d5f3086
Revise scaling for USAC combined with phase coding in SpatialDecApplyM2() to prevent signed integer overflow.
...
Bug: 146937759
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: If7c484b2e1bee82747f5c6dc0ee7ad1f282c0189
2020-01-14 14:48:07 -08:00
Fraunhofer IIS FDK
25fb9adf6f
Avoid signed integer overflows in SpatialDecApplyParameterSets() when adding dry and wet signal.
...
Bug: 146936964
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idb4242d54b2e61805ab071a8977eed8f06081edf
2020-01-14 14:44:56 -08:00
Fraunhofer IIS FDK
76c229c018
Introduce scaling in FDKhybridSynthesisApply() to avoid potential signed integer overflow.
...
Bug: 146937225
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ifa3d157a842828c2a66694d95dad5d4992ff6d87
2020-01-14 14:41:41 -08:00
Fraunhofer IIS FDK
7019272646
Prevent signed integer overflow in fMultIceil() for case m_e=-31.
...
Bug: 146934600
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8a67a3b17f3ec3af753b6463b72ae2947986b39c
2020-01-14 14:35:18 -08:00
Jean-Michel Trivi
0c42941882
Merge "Revert "Add TEST_MAPPING for aac project""
2020-01-03 15:33:32 +00:00
Jean-Michel Trivi
8458e48f05
Revert "Add TEST_MAPPING for aac project"
...
This reverts commit b10c18741e
.
Reason for revert: cf_x86_phone-userdebug breaks on those tests
Bug: 147097191
Change-Id: I15eccdc2a8527f526882dc6e5df241f404cb163d
2020-01-03 00:17:38 +00:00
Jean-Michel Trivi
47b23c88cf
Merge "Add TEST_MAPPING for aac project"
2019-12-30 18:46:11 +00:00
Jean-Michel Trivi
b10c18741e
Add TEST_MAPPING for aac project
...
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
2019-12-27 12:56:18 -08:00
Fraunhofer IIS FDK
8cd3578cc6
Fix for OPD smoothing in USAC decoder.
...
Bug: 145668878
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I075e3230d53c5a848f93541a9918c5bfaf2df725
2019-12-27 11:36:55 -08:00
Fraunhofer IIS FDK
7104c00b44
Move array definition out of for loop in MPEG-D DRC _skipEqInstructions().
...
Bug: 145669488
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Icb71fb1cb8e0b64ae969276d08746f687a753467
2019-12-27 10:28:39 -08:00
Fraunhofer IIS FDK
5357a4411a
Use saturate shift to prevent signed integer overflow in multiple qmfInverseModulation*() functions.
...
Bug: 145669510
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I4cee10423bc14e3db26de877b5e70701ac3324da
2019-12-27 10:25:23 -08:00
Fraunhofer IIS FDK
9d40b65b15
For all scaleValuesSaturate() variants make source pointer const.
...
Bug: 145669510
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ib69a4f12405026d3165193f0192eb25eaed7e797
2019-12-27 10:24:28 -08:00