aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge v2.0.2 into dabplus2Matthias P. Braendli2021-06-01123-2519/+3889
|\
| * Bump the versions and add changelog entries for v2.0.2Martin Storsjo2021-04-283-5/+11
| |
| * Add files missing from EXTRA_DISTMartin Storsjo2021-04-281-0/+4
| |
| * Specify the macOS compatibility version to make it a drop-in replacement for ↵Martin Storsjo2021-04-281-1/+3
| | | | | | | | the libtool built
| * Don't use enums for values read directly from the bitstreamMartin Storsjo2021-04-231-5/+5
| | | | | | | | | | | | | | | | | | | | The enums don't cover all possible values read from the bitstream. This fixes undefined behaviour sanitizer errors. Fixes: 31011/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-4981228811976704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Made this compatible with cmake version 3.5.1Staz M2021-04-071-1/+1
| |
| * Merge remote-tracking branch 'aosp/master'Martin Storsjo2021-03-044-59/+216
| |\
| | * Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: Id04d2590c249cad13da8dd8975d0a12ce96a9597 Change-Id: I4da99b78b01817308d8572d3c0d5b224b7d36a73
| | | * Mark ab/6881855 as merged am: b831187d3aXin Li2020-11-240-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547 Change-Id: Id04d2590c249cad13da8dd8975d0a12ce96a9597
| | | * \ [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I9d8f11842a7d222ff9eaf50be2e44f1507c4bb49
| | | | * \ [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
| | | * | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc66ac802e4e6eec723e5e762cf94f107f5f7ba6
| | | | * | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ia3fae7d8939333684ff3ea15081ac69624d58873
| | | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: Ib5460d11c6484d4794e75fcd4c9ba48a4b57a472
| | | | * | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
| | | * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s ours am: ↵Xin Li2020-10-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacea3ffc5 -s ours am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744 Change-Id: Ideafc491bc2347878d68eb5c50389169382cc35c
| | | | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s oursXin Li2020-10-090-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744 Change-Id: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d
| | * | | \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06fBob Badour2021-02-172-0/+42
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I37a9304f439a0ed700126de649a37378d03ce6bc
| | | * \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac"Bob Badour2021-02-172-0/+42
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to external/aacBob Badour2021-02-142-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-Apache-2.0 to: fuzzer/Android.bp Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I518bcad1cb91b80b2bcce1726f53aadf9afc749e
| | * | | | | | | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8Treehugger Robot2021-02-171-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib28a2522296895dec1d6a5cc465a7427e19ab93a
| | | * | | | | | | | | Merge "Fix improper assignment in aac_enc_fuzzer"Treehugger Robot2021-02-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix improper assignment in aac_enc_fuzzerAnuj Joshi2021-02-171-1/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the fuzzer to use correct value of kSignalingModesSize and prevent OOB access on kSignalingModes Test: ./aac_enc_fuzzer Bug: 180220144 Change-Id: Ic9d01c5c166f2291d8d8ffacaa7813fb1560322b
| | * | | | | | | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62Treehugger Robot2021-02-143-52/+174
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9e8b3426ba251349474e101fa5038172de4ad70
| | | * | | | | | | | Merge "aac_enc_fuzzer: Improve code coverage"Treehugger Robot2021-02-143-52/+174
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | aac_enc_fuzzer: Improve code coverageAnuj Joshi2021-02-013-52/+174
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_enc_fuzzer Bug: 172429950 Change-Id: Id8c5c6351627ba09d6b0f8eeb81ad81003eba0c5
| | * | | | | | | | | Merge "aac remove diag" am: f13c7a4054Cindy Zhou2021-01-201-7/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I228ca5c02b5284a17e96c2f09adc27848d364703
| | | * | | | | | | | 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" am: 093573a634Kris Alder2021-01-133-9/+484
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1527719 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3295eaed1814e256668526f4ea9c41743dd4431
| | * | | | | | | | | | Merge "Enable cfi for aac" am: 5690f9c39fCindy Zhou2021-01-081-2/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b4ff4c9a2e1ccd1139a37ac2a537467efee9583
| | * | | | | | | | | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash ↵Treehugger Robot2021-01-084-36/+83
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery usage." am: 5d8224586c Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1542709 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I676c98594c21af87992da5e4286d8c83f6a11098
| * | | | | | | | | | | Remove the separate nmakefile for MSVCMartin Storsjo2021-03-042-321/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake files should work equally well for MSVC nowadays.
| * | | | | | | | | | | Fixed a typo in the documentationChristian Budde2021-03-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Avoid failing asserts on broken bitstreamsMartin Storsjo2021-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 29712/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5347313432264704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * | | | | | | | | | | Add CMake projectevpobr2021-01-205-0/+627
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2021-01-148-47/+575
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | 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