Commit Graph

990 Commits

Author SHA1 Message Date
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
Fraunhofer IIS FDK 40c083f59a Avoid negation of INT_MIN in dst_IV().
Bug: 145669114
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I6ddd7a39376c5276ec636572c3bfd4d83d05f9f5
2019-12-27 10:23:31 -08:00
Fraunhofer IIS FDK 2334454bc8 Add sanity check for huffman escape sequences in HCR tool.
Bug: 145669389
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iaa624f3040269b5c84883bc3ee38cad7cd88e54d
2019-12-27 10:22:23 -08:00
Fraunhofer IIS FDK 3700d4ff8f Prevent negation of INT_MIN in pcmLimiter_Apply().
Bug: 145668877
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I734f839818f7130615a4438b8831ac664206cc34
2019-12-27 10:21:33 -08:00
Fraunhofer IIS FDK 801b45ffab Adjust scaling in lppTransposerHBE() to prevent signed integer overflow in autocorrelation.
Bug: 145669291
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia32b081b982d6886f51642a7ed1ca73acb40dac9
2019-12-27 10:20:36 -08:00
Fraunhofer IIS FDK c69e4584c3 Fix signed integer overflow in DuckerCalcEnergy().
Bug: 145668917
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9f6458860901fa354a534e8fabe20dfa1a0cf7a9
2019-12-27 10:18:47 -08:00
Fraunhofer IIS FDK 7bb841dfb1 Avoid signed integer overflow in subbandTPApply() wet energy calculation.
Bug: 145668345
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I92cfb0412d11c8a41431294a2a7fe399dc756f44
2019-12-27 09:56:00 -08:00
Fraunhofer IIS FDK 110e4ca996 Avoid signed integer overflow in subbandTPApply() dry energy calculation.
Bug: 145668819
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I4f61efa70e77ae64b99fe7cafbc2b43f5cc09b06
2019-12-27 09:03:39 -08:00
Fraunhofer IIS FDK ee6c6fa4ba Fix dry and wet energy initialization in subbandTPInit().
Bug: 145668025
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iadf5d4ebcecfa544b688a69d569ad515c0affade
2019-12-27 09:02:47 -08:00
Fraunhofer IIS FDK 24171ed080 Add loop abort criterion to prevent timeout in EldSpecificConfig_Parse().
Bug: 145668344
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea6457e8545438c7ad4d05a682ffa656ec35ead9
2019-12-27 09:01:55 -08:00
Fraunhofer IIS FDK 089d368ddb Prevent signed integer overflows in ELD filterbank, multE2_DinvF_fdk().
Bug: 145669388
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iaba69b58666833c90e05b296c502ba6509a087a9
2019-12-27 09:01:22 -08:00
Fraunhofer IIS FDK 68cdcfc6b8 Avoid signed integer overflows in multiple adjustTimeSlot*() functions.
Bug: 145669628
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Id0f3ee9d3413e534505c0c7eea379ce42880ca79
2019-12-27 08:59:49 -08:00
Fraunhofer IIS FDK 2ce3e76d0f Improve robustness of limiter band table calculation in ResetLimiterBands().
Bug: 145668973
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic076cf5b44c0618734064b670de61f9da532a13e
2019-12-27 08:58:46 -08:00
Fraunhofer IIS FDK 5838a313ae Fix signed integer overflow in pvcDecodeTimeSlot().
Bug: 145668022
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0a165330cf174f24310f8d705523d310a3522e7a
2019-12-27 08:54:50 -08:00
Fraunhofer IIS FDK 07b5fd9941 Use one additional bit headroom to prevent signed integer overflow in BuildAdaptiveExcitation().
Bug: 145666984
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I5c881238562c3d9f7cd8d77a8c52f7231126587f
2019-12-27 08:51:59 -08:00
Xin Li 77e652f766 [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7ea2e46dc1
am: 13d520b193 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic14cc4914dfb877a04b150b63f8cb1f10a9646c7
2019-10-30 14:42:53 -07:00
Xin Li 13d520b193 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 7ea2e46dc1

Change-Id: I580bebbf6a96c5ef6dfbb8e691917c16207551bb
2019-10-30 14:20:53 -07:00
Xin Li 7ea2e46dc1 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I809fba949d51f01395793ccb36118e4f5c42e5be
2019-10-30 11:47:28 -07:00
Jean-Michel Trivi fc8faa38d9 FDK: USAC CLpd_Reset uses rate constants
Use constants defined in libAACdec/src/usacdec_const.h

Test: atest DecoderTestXheAac
Change-Id: Idf1aa9fefb92b1abf64f50b044b2490b0d31b426
2019-10-21 15:20:42 -07:00
Fraunhofer IIS FDK 418526638a Initialize scale variable in qmfForwardModulationLP_even() and qmfInverseModulationLP_even() which is updated in dct/fft processing.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Id294afb1ac740abf6000d7286e0f95c8b13a7eb8
2019-10-18 10:59:05 -07:00
Fraunhofer IIS FDK b2f2a109d3 Limit too large shift value in apply_inter_tes().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I38cc7053e671f6e20a1a9ba4f1645d1cf8be77e2
2019-10-18 10:58:52 -07:00
Fraunhofer IIS FDK 54cd15bd80 Fix nrgGain_e update in equalizeFiltBufferExp(). Prevents negative shift exponents in calculateSbrEnvelope().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I66ad54dae0fa1d414d8b2b9a9e0b6145cce4042d
2019-10-18 10:58:40 -07:00
Fraunhofer IIS FDK ade11a1d6f Prevent signed integer overflows in CLpd_FAC_Mdct2Acelp().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I348fe4be577ac39f961352902d138a8e07982096
2019-10-18 10:58:26 -07:00
Fraunhofer IIS FDK b8f7bab39c Fix integer overflow in imlt_block().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia7e03bbf6daef61079514de407a5900f6dc22a21
2019-10-18 10:58:14 -07:00
Fraunhofer IIS FDK 920ecc7487 Prevent signed integer overflows in CLpd_FAC_Acelp2Mdct().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I216f97b0c75a9076f3963036b098af37b390c5bb
2019-10-18 10:58:01 -07:00
Fraunhofer IIS FDK 3634955ca5 Fix integer overflow in complex multiplication called from CLpd_FAC_Acelp2Mdct().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I7cd234698821cf13b163d323cfd90fdccaaec3c1
2019-10-18 10:57:37 -07:00
Fraunhofer IIS FDK f22eb9c1fa Avoid signed integer overflow in bass_pf_1sf_delay().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I67bfab71987b31601a4666c8cf292f71bcb6799a
2019-10-18 10:57:23 -07:00
Fraunhofer IIS FDK ea9d3a049b Prevent signed integer overflow in filtLP().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8da32f4794274e2955936ccd42c009485fbe1972
2019-10-18 10:57:05 -07:00
Fraunhofer IIS FDK 9ba6f8b6a2 Fix signed integer overflow in calcFactorPerBand() calculation.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9f18f675112651be8dec5c0474601ca6531fbf15
2019-10-18 10:56:10 -07:00
Fraunhofer IIS FDK a7029823f4 Prevent integer overflow in sbrDecoder_calculateGainVec().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I359f7f976a5ad5459be7d7b786145988a175e305
2019-10-18 10:54:57 -07:00
Fraunhofer IIS FDK 2152ae1a5e Suppress integer overflow in lsf_weight_2st() by using 64 bit multiplication with explicit 32 bit integer result.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I82ce4858688e90abee0c44c4ada34a9a7b08342f
2019-10-15 15:50:10 -07:00
Fraunhofer IIS FDK 3c377e3305 Prevent signed integer overflow in RE8_PPV().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic66ac4742d8e466431c5cf09d02b0d9c7f842df2
2019-10-15 15:49:37 -07:00
Fraunhofer IIS FDK 4db9f39f6d Avoid signed integer overflow in E_LPC_f_lsp_a_conversion().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: If2110ad246bb5b57ef76c9cd251874ecd4b05109
2019-10-15 15:49:23 -07:00
Fraunhofer IIS FDK 2d292e9b2d Use SATURATE_LEFT_SHIFT in get_lsppol() to prevent integer overflow.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie9ec52485a52b076a900b111b035289110c004f8
2019-10-15 15:49:00 -07:00
Fraunhofer IIS FDK 4c839c6a90 Fix integer overflow in E_UTIL_preemph().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iaaa0630e59d8e83e58b25168a3db04304485429b
2019-10-15 15:48:46 -07:00
Fraunhofer IIS FDK 1b4a3bedbb Overcome potential integer overflows in M/S module for complex prediction.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic0648203b6a61ebff8bcc93c4b1099e033bc6860
2019-10-15 15:48:32 -07:00
Fraunhofer IIS FDK 40d2a1d8b0 Avoid integer overflows with pseudoLR in CAacDecoder_DecodeFrame().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I5c83d72b5c0f4cd1569b648f102c8c549a7a6ac2
2019-10-15 15:47:53 -07:00
Fraunhofer IIS FDK f0e1e3f8c7 Validate correct ascLen in CLatmDemux_ReadStreamMuxConfig() to overcome integer overflow in FDK_get32().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I87b53661df7a435ddf3572a0ff8b6ef84972db60
2019-10-15 15:47:17 -07:00
Fraunhofer IIS FDK da5b0dcb3c Restrict size of huffman escape sequence to prevent shift with too large exponent in DecodeEscapeSequence().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ibcd182e313e9ef480e92619023bf424762b92e23
2019-10-14 15:19:19 -07:00
Fraunhofer IIS FDK 15965e3feb Limit too large shift exponent in CJointStereo_ApplyMS()
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia6ab654654e899368ba207a66eddf22b6b855635
2019-10-14 15:14:28 -07:00