aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
|\ | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I8be6b18443220d62f6f0241003080db5da857e61
| * [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I9a57636513443249a25c6789ed2eb975cf91b45c
| | * [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: Iad32917ed1a93b0a8749e6cad3555481a570943d
| | | * [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-091-3/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I0f5863139bc848401b905625fdc572793755b8cf
| | | | * [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-091-3/+10
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I40c07a02e1528540b24a5380cff1249ed5076193
| | | | | * [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-07-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). 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 DecoderTestXheAac Change-Id: I741f49ab3b675fa3d3217ee72e1db66b0114f7ee
* | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c516539a20 am: 17dd8dfad9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I6162868554166db622bc72fb47a9cc61aaa51881
| * | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c516539a20 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I41058bf1a076509c564defa70247dcbfa91c64d0
| | * | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-07-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e Change-Id: I8569a15214707ab622e986b34b4b917251495662
* | | | | | Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()Fraunhofer IIS FDK2019-05-171-7/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5def92cb0f Change-Id: Ib2bb23763ffadc6a34669d0db79d203991cdf141
| * | | | | Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()Fraunhofer IIS FDK2019-05-161-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 121226473 Test: see bug with specific audio stream to encode Change-Id: I282506f0856130fa00c7f7c6e94b18e1162c8593
* | | | | | Fix integer overflow in FDKaacEnc_IntensityStereoProcessing().Fraunhofer IIS FDK2019-05-151-6/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55002323b3 Change-Id: I7f14e3b7bd79110eff8b01184483ab4e2c4fc9b3
| * | | | | Fix integer overflow in FDKaacEnc_IntensityStereoProcessing().Fraunhofer IIS FDK2019-05-151-6/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Id2a7e26fff499146a39cea757b1b7fc787b54b31
* | | | | Improve phase coding accuracy by use of splitAngle lookup table.Fraunhofer IIS FDK2019-05-143-81/+3760
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I7fd83b478f4156a0abb7ac42cd6d9b6cf0ac8b91
* | | | | Improve random phase table accuracy.Fraunhofer IIS FDK2019-05-142-1063/+537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ifca82aec87c0d21871d1f181b1be635c419433ee
* | | | | Increase scale factor gain in TES tool.Fraunhofer IIS FDK2019-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I498be80902da32944ab456436689ca4aba42d3f6
* | | | | Improve accuracy of division in calcSubbandGain().Fraunhofer IIS FDK2019-05-141-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I3beeda23355ae1200d9f55c9e8cd1cc6bc899153
* | | | | Avoid -1.0 autocorrelation input data.Fraunhofer IIS FDK2019-05-141-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I2d4ccf9ee666a5533417ea98302de4a01b74c5ce
* | | | | Increase scale factor to avoid overflows in function factorCLD().Fraunhofer IIS FDK2019-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8f5f67375b3413cce855bddc18ce0546caa01062
* | | | | Fix out of sync function declaration of scaleValues().Fraunhofer IIS FDK2019-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I1b9a204c52aee20adabc1baee7f5e5cdbf1ee39e
* | | | | Fetch multiple samples of input channels from encoder input buffer.Fraunhofer IIS FDK2019-05-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I548c62efcbe2629479f671befd4388895d835de7
* | | | | Fix HE-AAC using MPEG-D DRC with implicit SBR signaling.Fraunhofer IIS FDK2019-05-137-94/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132641988 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I97c5d3972528092f627153ad3127c7db977a0e5d
* | | | | MPEG-4/D DRC unification, loudness norm default at -24Fraunhofer IIS FDK2019-04-255-54/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify API parameter of MPEG-4/D DRC and introduce rounding to boost/compress setParam function (FDKdec v3.1.1). Enable Loudness Normalization with target loudness -24 by default (FDKdec v3.1.2). Bug: 131255165 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I249a36b4861d0c8d4a0ed2df4dc1f444576bac6b
* | | | | Add support for Album Mode (FDKdec v3.1.0).Fraunhofer IIS FDK2019-04-247-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 131255165 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I6b4b176ec497587238537bddd89889341733d4e2
* | | | | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b81f869de3 Change-Id: Id5a12cd85e70b3ec017e04212db6f922fb3f64bd
| * | | | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
* | | | | Reset parameter smoothing tool while concealment.Fraunhofer IIS FDK2019-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ec328096e88f5de984daca85a87c200827e7048
* | | | | Discard SBR data in case of unsuccessful SBR header update.Fraunhofer IIS FDK2019-03-151-5/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I31ab01476d5a9de273c7adce14a1c29fa0023682
* | | | | Merge "Trigger config change after a change in SBR activity has been ↵Jean-Michel Trivi2019-03-151-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | recognized."
| * | | | | Trigger config change after a change in SBR activity has been recognized.Fraunhofer IIS FDK2019-03-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7715e61fdfcd16dfae6029171888aef9c6f0738e
* | | | | | Merge "Clear config in case of parsing error in drcDec_readUniDrc()"TreeHugger Robot2019-03-150-0/+0
|\| | | | |
| * | | | | Clear config in case of parsing error in drcDec_readUniDrc()Fraunhofer IIS FDK2019-03-141-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I827a1ddbed2cf10e6b4fabdea2bf3f71c8f30c6f
* | | | | | Merge "Clear config in case of parsing error in drcDec_readUniDrc()"Jean-Michel Trivi2019-03-141-2/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clear config in case of parsing error in drcDec_readUniDrc()Fraunhofer IIS FDK2019-03-141-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ic1a12cbd31aa51d8a89bc4d6a67f9b0289265b6c
* | | | | | Merge "Always call startSelectionProcess() independent on an error in ↵TreeHugger Robot2019-03-141-14/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FDK_drcDec_ReadUniDrc()"
| * | | | | | Always call startSelectionProcess() independent on an error in ↵Fraunhofer IIS FDK2019-03-141-14/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDK_drcDec_ReadUniDrc() Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie7fdb69ea7a6d68b14b9fa06e68c86496cb01a02
* / / / / / Add MPEG-D DRC sanity checksFraunhofer IIS FDK2019-03-144-8/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I5413e43d5cfc895b8c3171f8857ca6feab6c269e
* | | | | Merge "AAC decoder: fix use of uninitialized value, check index"Jean-Michel Trivi2019-03-081-1/+2
|\ \ \ \ \
| * | | | | AAC decoder: fix use of uninitialized value, check indexJean-Michel Trivi2019-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize aInterpolate int array in mapIndexData(). Prevent index from accessing OOB value. Bug: 120426980 Test: see bug Change-Id: Ib9f1b5e143802d3d662af36fedcae8bf47ff09bc
* | | | | | Merge "libSBRdec: prevent OOB access"TreeHugger Robot2019-03-081-0/+4
|\ \ \ \ \ \
| * | | | | | libSBRdec: prevent OOB accessJean-Michel Trivi2019-03-071-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In generateFixFixOnly() check validity of index before accessing SBR decoder envolope tables. Bug: 112052062 Test: see bug Change-Id: Icd7ec3807eea9ef8417dba7383f361101becc4f2
* / / / / / libMpegTPDec: fix use of uninitialized value in OutOfBandConfigJean-Michel Trivi2019-03-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize tmpConf in transportDec_OutOfBandConfig Bug: 120426166 Test: see bug Change-Id: I72ac8bc96a7d386ffe32acd669c78c4a581d52dc
* | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 719ad2e600 Change-Id: I2eda96b8a597569263b841f21b66b55b5e9a4971
| * \ \ \ \ Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: If648fc23ea1edee18f0bf264b7b35aac504a25b5
| | * \ \ \ \ DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I1bbe11b78b2f06f948be0e04fcae6582bad9cc21
* | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours am: 2ef1b029ce -s ours am skip reason: subject contains skip directive Change-Id: I9f869083551264692a4efe9d94a8085ba2ace4d0
| * | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours am skip reason: subject contains skip directive Change-Id: I33bcb484a7e06e1f38cbd7dc9e25faccdc7feede
| | * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-200-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d5724aefe9 -s ours am skip reason: subject contains skip directive Change-Id: I2b7fecb7f6abba1645b3a201c9ae9bf57b22882e
| | | * \ \ \ \ \ Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-201-4/+4
| | | |\ \ \ \ \ \
* | | | | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ac13ae4aa -s ours am: b3537f907a -s ours am: 9d138bd1e3 -s ours am skip reason: subject contains skip directive Change-Id: I241eff03f8e88fb2cef002ade4f415d42759b1fd