Commit Graph

31 Commits

Author SHA1 Message Date
Kris Alder 0f130d51b8 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f
Change-Id: Ie5c84f6923184c564793de5e5f0007bc197415e7
2020-04-09 16:47:26 +00:00
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 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 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 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 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 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 0be235952d Solve potential dereference of null pointers in factorCLD().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I27334567d1887755d62fadf2456fd5366869cbab
2019-10-11 10:05:36 -07:00
Fraunhofer IIS FDK 2b5217a953 Fix possible stack buffer overflow in mapIndexData().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I160e7174f32dabe386fce1e9ec67d3c8cea60c78
2019-10-11 09:41:07 -07:00
Fraunhofer IIS FDK f6a6a071a9 Improve phase coding accuracy by use of splitAngle lookup table.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I7fd83b478f4156a0abb7ac42cd6d9b6cf0ac8b91
2019-05-14 14:18:25 -07:00
Fraunhofer IIS FDK ce00007148 Increase scale factor to avoid overflows in function factorCLD().
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I8f5f67375b3413cce855bddc18ce0546caa01062
2019-05-14 09:30:37 -07:00
Fraunhofer IIS FDK 592c03a9f0 Reset parameter smoothing tool while concealment.
Change-Id: I9ec328096e88f5de984daca85a87c200827e7048
2019-03-15 18:57:14 +00:00
Jean-Michel Trivi 8e27e0bd30 AAC decoder: fix use of uninitialized value, check index
Initialize aInterpolate int array in mapIndexData().
Prevent index from accessing OOB value.

Bug: 120426980
Test: see bug
Change-Id: Ib9f1b5e143802d3d662af36fedcae8bf47ff09bc
2019-03-07 15:04:08 -08:00
Fraunhofer IIS FDK c47066df27 Add QMF analysis band sanity check
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
2019-01-15 12:19:05 -05:00
Fraunhofer IIS FDK 5c54fa5387 Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Ic106c4371c5ac17cb832c7d9db042bcc9d1e7a09
2019-01-03 10:25:40 -05:00
Fraunhofer IIS FDK f440f28aa3 Return SpatialDecDecodeFrame() parse error in case extended frame does not match the spatial frame
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I7add6dff3b60ba0b36e5c83cee8031b37e970890
2019-01-02 13:36:02 -05:00
Fraunhofer IIS FDK 4a22282fe0 Add sanity check in SpatialDecParseSpecificConfig()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0249f75839829fdbc96218425e59ad914f9dfeda
2019-01-02 13:28:34 -05:00
Fraunhofer IIS FDK 80fa8b8067 Clear spatial specific config struct at the beginning of parse routines
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I6e198942f3a065de9615eac544fdc73120d24b1e
2018-12-28 20:00:08 -05:00
Fraunhofer IIS FDK c371e86ef4 QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I7c851b9db88c6250b5ad30282b8b19ea306e4e12
2018-12-28 19:53:08 -05:00
Fraunhofer IIS FDK 64134e60b3 Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warnings
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9f9064fb63ac40e18f245c00b7375b4874f2925b
2018-12-27 14:17:51 -05:00
Fraunhofer IIS FDK bfa96f60bc Unsigned Integer Overflows in mpegSurroundDecoder_Parse().
Bug: 112661835
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3714e88d7a9a866297bb2e93571804665a97773f
2018-12-26 14:01:46 -05:00
Fraunhofer IIS FDK b325367b33 Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader().
Bug: 112661893
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d
2018-11-27 12:34:42 -05:00
Fraunhofer IIS FDK 44ac411683 FDK patches: fix overflows in decoder out-of-band config
Bug: 71430241
Bug: 79220129
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestXheAac
      cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestAacDrc

Unsigned Integer Overflows in CDataStreamElement_Read()

Change-Id: Ic2f5b3ae111bf984d4d0db664823798957b0a979

Unsigned Integer Overflow in CProgramConfig_ReadHeightExt()

Change-Id: Iaebc458bb59504203e604a28ed6d5cecaa875c42

Unsigned Integer Overflow in transportDec_OutOfBandConfig()

Change-Id: I24a4b32d736f28c55147f0e2ca06fe5537da19c2

Unsigned Integer Overflows in CDKcrcEndReg() & crcCalc()

Change-Id: I6ebbe541a4d3b6bacbd5ace17264972951de7ca8

Unsigned Integer Overflows in ReadPsData()

Change-Id: Id36576fe545236860a06f17971494ecd4484c494

Unsigned Integer Overflow in SpatialDecParseSpecificConfig()

Change-Id: Ib468f129a951c69776b88468407f008ab4cfd2c7

Unsigned Integer Overflows in _readUniDrcConfigExtension() & _readLoudnessInfoSetExtension()

Change-Id: Ibcf7c6a23af49239206ea9301c58adac36e3ceba
2018-05-09 15:15:28 -07:00
Fraunhofer IIS FDK 9ab67882ec FDKv2 additional fixes
Bug: 71430241
Bug: 79220129
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestXheAac
      cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestAacDrc

Add restriction to call intensity stereo tool only for applicable configurations

Change-Id: I30ec6640bd484c56cc9d5b8b35186fc1c875e021

Fix high band energy calculation in sbr encoder

Change-Id: I964dd46fab2ed797c440a983512bbab7e1aff98a

Fix out-of-bounds read access in noiseless coder

Change-Id: I9a669435dbdca421ff9e4affec57811002d75b3b

Use temporary buffer for dummy parsing to check presence of audioPreroll data

Change-Id: I2d42c5c8deddde34351c3d2858b9fe196b3a0906

Set applyAsc to 1 in case that the ASC parsing fails

Change-Id: I552a8b960270bc18cae459ad28a3ba241035668e

Parametric stereo together with mps not supported

Change-Id: Icde14a2774a4303bb0c41046861a59d04b624365

Align ssc callback error path for drm

Change-Id: Ie8ecbfa42c702e6df81c1aec532a9ff1e653dac9

Ensure that the bit counter starts at a multiple of TPDEC_SYNCSKIP

Change-Id: I08d69ec361b2e2ed800282e333fd248b4b3ca245

Allow flushing only when audioPreroll is enabled in current and new config

Change-Id: I52e95d75de4bbed692be922a59a23bda58870625

Omit reverse channel mapping in pass through mode

Change-Id: I335e209c29a700cc091be069f1d08e4288b40793
2018-05-04 11:05:58 -07:00
Fraunhofer IIS FDK 6cfabd3536 Upgrade to FDKv2
Bug: 71430241
Test: CTS DecoderTest and DecoderTestAacDrc

original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30

Apply clang-format also on header files.

original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4

Fixes for MPEG-D DRC

original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c

Catch unsupported tw_mdct at an early stage

original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe

Fixing PVC transition frames

original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e

Move qmf bands sanity check

original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4

Initialize scaling variable

original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e

Add 16 qmf band configuration to getSlotNrgHQ()

original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1

Always apply byte alignment at the end of the AudioMuxElement

original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7

Setup SBR element only if no parse error exists

original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676

Additional array index check in HCR

original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267

Fix fade-in index selection in concealment module

original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1

Enable explicit backward compatible parser for AAC_LD

original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d

Skip spatial specific config in explicit backward compatible ASC

original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e

Update flags description in decoder API

original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830

Add QMF domain reset function

original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6

DRC upgrade v2.1.0

original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74

Fix integer overflow in sqrtFixp_lookup()

original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914

Fix integer overflow in invSqrtNorm2()

original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155

Fix integer overflow in GenerateRandomVector()

original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74

Fix integer overflow in adjustTimeSlot_EldGrid()

original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5

Fix integer overflow in FDKsbrEnc_codeEnvelope()

original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449

Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid()

original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a

Fix integer overflow in get_pk_v2()

original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c

Fix integer overflow in Syn_filt_zero()

original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279

Fix integer overflow in CFac_CalcFacSignal()

original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5

Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH()

original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841

Fix integer overflow in sbrDecoder_calculateGainVec()

original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507

Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881

Fix integer overflow in Pred_Lt4()

original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a

Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector()

original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04

Fix unsigned integer overflow in FDKaacEnc_WriteBitstream()

original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a

Fix unsigned integer overflow in FDK_MetadataEnc_Init()

original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4

Fix overflow in pseudo random number generators

original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c

Fix unsigned integer overflow in sbrDecoder_Parse()

original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971

Fix unsigned integer overflow in longsub()

original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e

Fix unsigned integer overflow in CAacDecoder_DecodeFrame()

original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4

Fix overflow at CLpdChannelStream_Read()

original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f

Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD()

original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c

Fix unsigned integer overflow in UsacConfig_Parse()

original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f

Fix unsigned integer overflow in aacDecoder_drcParse()

original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0

Fix unsigned integer overflow in aacDecoder_drcReadCompression()

original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a

Fix unsigned integer overflow in CDataStreamElement_Read()

original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0

Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit()

original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc

Fix unsigned integer overflow in transportDec_GetAuBitsRemaining()

original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4

Fix unsigned integer overflow in extractExtendedData()

original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f

Fix signed integer overflow in CAacDecoder_ExtPayloadParse()

original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929

Fix unsigned integer overflow in CAacDecoder_DecodeFrame()

original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090

Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f

Fix signed integer overflow in _interpolateDrcGain()

original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60

Fix unsigned integer overflow in FDKreadBits()

original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad

Fix unsigned integer overflow in FDKbyteAlign()

original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766

Fix unsigned integer overflow in FDK_get32()

original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96

Fix unsigned integer overflow in FDK_pushBack()

original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19

Fix unsigned integer overflow in FDK_pushForward()

original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc

Fix unsigned integer overflow in ReadPsData()

original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37

Fix signed integer overflow in E_UTIL_residu()

original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad

REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice().

original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b

Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590

Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse()

original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d

Fix integer overflow in acelp

original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77

Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()

original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2

Adjust concealment default settings

original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21

Saturate estimatedStartPos

original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6

Negative shift exponent in _interpolateDrcGain()

original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29

Negative shift exponent in calculateICC()

original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba

Too large shift exponent in FDK_put()

original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671

Too large shift exponent in CalcInvLdData()

original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262

Member access within null pointer of type SBR_CHANNEL

original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097

Member access within null pointer of type CpePersistentData

original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d

Member access within null pointer FDKaacEnc_psyMain()

original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997

Member access within null pointer FDKaacEnc_GetPnsParam()

original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39

Member access within null pointer FDKsbrEnc_EnvEncodeFrame()

original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a

Add HCR sanity check

original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7

Fix memory issue for HBE edge case with 8:3 SBR

original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9

Additional SBR parametrization sanity check for ELD

original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140

Add MPEG-D DRC channel layout check

original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72

Additional out-of-bounds checks in MPEG-D DRC

original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4

Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e
2018-04-19 11:21:15 -07:00