aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* aac_enc_fuzzer: Improve code coverageAnuj Joshi2021-02-013-52/+174
| | | | | | | Test: ./aac_enc_fuzzer Bug: 172429950 Change-Id: Id8c5c6351627ba09d6b0f8eeb81ad81003eba0c5
* Merge "aac remove diag"Cindy Zhou2021-01-201-7/+0
|\
| * aac remove diagCindy Zhou2021-01-131-7/+0
| | | | | | | | | | | | | | | | Removing diag mode since it's only required for debugging purposes. Bug: 158010610 Test: n/a Change-Id: I597880ef5b63d12d2971237d02406faceda7e623
* | Merge "Added aac_enc_fuzzer"Kris Alder2021-01-133-9/+484
|\ \ | |/ |/|
| * Added aac_enc_fuzzerAnuj Joshi2020-12-283-9/+484
| | | | | | | | | | | | | | Test: ./aac_enc_fuzzer Bug: 172429950 Change-Id: Ia84f85425f6df10b13a3d045472f7f684f27eb8a
* | Merge "Enable cfi for aac"Cindy Zhou2021-01-081-2/+8
|\ \
| * | Enable cfi for aacCindy Zhou2020-12-171-2/+8
| |/ | | | | | | | | | | | | | | | | | | | | Bug: 158010610 Bug: 173497308 Test: ran atest DecoderConformanceTest, ImageReaderDecoderTest, VideoDecoderPerfTest, VideoEncoderTest. Compare the before and after enabling CFI results since there was a number of tests that were initially failing. Change-Id: I0d0d2a76512dc909a67f34adacff9ffbf536dbe7
* | Merge "Adjust VBR mode depending on given peak bitrate and fix crash ↵Treehugger Robot2021-01-084-36/+83
|\ \ | |/ |/| | | recovery usage."
| * Adjust VBR mode depending on given peak bitrate and fix crash recovery usage.Fraunhofer IIS FDK2021-01-084-36/+83
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Operating the FDK encoder in A2DP with variable bitrate mode configuration resulted in unexpected encoder return value AACENC_ENCODE_ERROR. Due to peak bitrate restriction the encoder quite often runs into requantization. In case the bitrate constraint is not fulfilled, the so-called crash recovery is used as final emergency step. The crash recovery reduces the overall bit consumption considering the given number of bits to be saved. The bit difference is extracted from audio element structures. In VBR mode the element wise bit consumption state was not updated since there is typically no bitrate limitation required. The patch solves the choppy audio problems and increases audio quality for AAC VBR encoding. The changes in FDKaacEnc_QCMain() ensure that audio element bit info is always updated. This is achieved by always calling FDKaacEnc_BitResRedistribution() and FDKaacEnc_prepareBitDistribution() with maxBitsPerFrame variable as total bits parameter. Furthermore, VBR assumes a certain target bitrate which is used for internal configuration and limitations. In case the peak bitrate parameter is less than the VBR mode target bitrate the maximum of both bitrate configurations was used. The function FDKaacEnc_AdjustVBRBitrateMode() is added to adjust the encoder internal VBR mode to a desired target bitrate less than given peak bitrate. It is possible that the peak bitrate is very close to the desired target bitrate. The virtual available bitreservoir is quite low and the encoder would run quite often into requantization with needless audio quality reduction. In such a configuration, it is a better choice to use the CBR targeted threshold adaption to avoid audio quality reduction. In FDKaacEnc_Initialize(), there was already a bitResMode selection depending on available bitreservoir for CBR. This selection will now also be used for VBR. In case the bitResMode is AACENC_BR_MODE_FULL and VBR mode is selected, the VBR threshold adaption is used. Otherwise, CBR threshold adaption strategy is used and therefore, no unnecessary fill bits are written. Bug: 161400526 Test: see bug Change-Id: I1865f817180150da6add2623a64f1a102622784a
* Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\ | | | | | | | | Bug: 172690556 Change-Id: I4edc064b9a87da525672e61919ec8fb59a70202e
| * [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: ↵Xin Li2020-09-110-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a0396347 -s ours am: c0dbde6b33 -s ours am: ec717def34 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I33abaa1c2d16e2b0b93b33e942c1e315fd1f29aa
| | * [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: ↵Xin Li2020-09-110-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a0396347 -s ours am: c0dbde6b33 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I5b8161f44651f40c168a81ba535e8c26ad5b533e
| | | * [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: ↵Xin Li2020-09-110-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a0396347 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I1713993ae0e8fb75c4e27fdad6c8e263b7391a03
| * | | \ [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-100-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 8ad12f29d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: Iefa0bc6d2f856953743b58518ce85ecc9d268428
| | * \ \ \ [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 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I8235c710a39639720ca3a52f6a0c84f3cbc6fe5f
| * | \ \ \ \ [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 am: ce38f54339 -s ours am: a3d45a6804 am: 846f899a2f am: 7b0e1e7056 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I6c6b66c316ec178db6d1e17712c07fe7819c9a10
| | * | | | | [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 am: ce38f54339 -s ours am: a3d45a6804 am: 846f899a2f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I26b07435bd9342cc5d03ab1b592a9c2327e200c2
| | | * | | | [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 am: ce38f54339 -s ours am: a3d45a6804 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: Icfcbfe06d528323ba83366db8bae197082329037
| * | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: e82257ae36 -s ours am: 1935ab0459 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I040218276ea001057c4caf0174917b6d4019a77b
| | * | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: e82257ae36 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: If77ba60c209bf8f0eab292b75cd5c6d5ec82ac3b
| | | * | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I26b8dd96bf69eadd2fbee7487516667598ba546a
| * | | | | | | | [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 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 421e4c1cdf Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I1bc389e9d78adac54555747734eb944ce4252e02
| | * | | | | | | [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 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: I2466f0be7926e6f135d774f0289198af18753804
| | | * | | | | | [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 am: ce38f54339 -s ours am: a3d45a6804 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: Idd4c6d188cc413f82b83b02ceee852d432a1e827
| | | | * | | | | [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 am: ce38f54339 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847 Change-Id: Ie337579b14a76c90016c6866d58422816d61ea0a
| | | | | * | | | [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
| * | | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: eb737fb95b -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I11fbcafea541a3a8cea729f0b6e76b905998ccfb
| | * | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I92f87237ef6f4a0b9a21801e738378d550e98465
| * | | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: 9474f4eb44 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I6089f72bd3a957d4ba782a933d9f28802d5d2978
| | * | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: Ie76449e6f28f51989ed628d4f996992147e72621
| | | * | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I8b35930cca12c2c5e2eb2614af497119b479b51a
| | | | * | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300 Change-Id: I5c2fc3f0ac04e75766a7f7141a6900f167023088
| | | | | * | | | | | | | | 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
| * | | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc am: 3cc9889e23 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: Idc492802d1f451c4ca1acd78ac83234f20183f29
| | * | | | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 am: f007f6a4bc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: Ic8c0828dd43d16559e13acd4204bddc26d2e249d
| * | | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: 33ea26a8d9 -s ours am: 87f3b1561f -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I2492f6df370ca3c624ed826bfa7966cfe640b824
| | * | | | | | | | | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: 33ea26a8d9 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I9493bb636397e8d30f8eb7f71ff67b7578df0da6
| | | * | | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: Iddc8a0642d6a5bf1f84edb74f943b5dddd1fb7fd
| * | | | | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 am: f007f6a4bc am: a5a3ef611c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I19cbfb6b908a878ce59e8c6869ba9c5957d10075
| | * | | | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 am: f007f6a4bc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I28c773eab019d0e518d34a26a9493811c8c1afea
| | | * | | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I85ffb1d0e64c206a805e36169e6d6b664924cc48
| | | | * | | | | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
| * | | | | | | | | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours am: 016718d3fd -s ours am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: If53b20173eefcedbe2a0eb7af822536437a97895
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 07:38:51 +0000