aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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().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 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: I96f0085bd119bdb9733ac647ffb40ee40893e931
| * \ Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2798-2107/+2228
| |\ \ | |/ / |/| | | | | | | | | | | Bug: 166295507 Merged-In: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f Change-Id: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
* | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0fJean-Michel Trivi2020-07-101-5/+61
|\| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
| * | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2Jean-Michel Trivi2020-07-101-5/+61
| |\ \ | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: I49925ff2d6e55f0def55bf012f7ff3f33cacea4e
| | * | Merge "Improve code coverage for aac_dec_fuzzer"Jean-Michel Trivi2020-07-101-5/+61
| |/| |
| | * | Improve code coverage for aac_dec_fuzzerS Vasudev Prasad2020-06-191-5/+61
| |/ / | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 158206619 Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
* | | point to new repo hooks for mainline uploads am: ebc1030f65Ray Essick2020-05-291-0/+2
|\ \ \ | | |/ | |/| | | | Change-Id: Ibaae6c3cebad3d20b19447824bc5433601081968
| * | point to new repo hooks for mainline uploadsRay Essick2020-05-261-0/+2
| | | | | | | | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
* | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9acTreehugger Robot2020-05-211-1/+1
|\ \ \ | | |/ | |/| | | | Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
| * | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796Treehugger Robot2020-05-211-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
| | * \ Merge "Fix license type s/b BY_EXCEPTION_ONLY"Treehugger Robot2020-05-211-1/+1
| | |\ \
| | | * | Fix license type s/b BY_EXCEPTION_ONLYBob Badour2020-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fraunhofer license has special requirements. Test: no code change Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
* | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30Kris Alder2020-05-211-0/+7
|\| | | | | | | | | | | | | | | | | | | Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
| * | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06Kris Alder2020-05-211-0/+7
| |\| | | | | | | | | | | | | | | | | | Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
| | * | | Merge "Added fuzz_config field in aac_dec_fuzzer"Kris Alder2020-05-211-0/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Added fuzz_config field in aac_dec_fuzzerAyushi Khopkar2020-05-191-0/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 156871294 Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
* | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 71c477bae4 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: Ib442bb5ad9e4d17b8c900e1afab96aca86d09c52
| * | | Set min_sdk_version to be part of mainline modulesJooyung Han2020-05-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 152655956 Test: m Merged-In: I662ad951a3221f967b53e7af65cb203a4b4a5e5d Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d (cherry picked from commit d40f05a61897c4ba746dd2b383fff0c158026c1f)
* | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235Treehugger Robot2020-05-041-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: If7805235d362630a3cd22e16d5d7a52bfae10157
| * | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4aTreehugger Robot2020-05-041-0/+3
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
| | * | Merge "Add METADATA to aac: Apache2=NOTICE"Treehugger Robot2020-05-041-0/+3
| | |\ \
| | | * | Add METADATA to aac: Apache2=NOTICEBob Badour2020-04-281-0/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I71f5c419c31c1758d4ee49158d40a50aef6abf5d
* | | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d ↵Treehugger Robot2020-04-221-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | am: 25647c87aa Change-Id: Id09d8cf7f25b3a6aaffc1a3414db290058921ff2
| * | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1dTreehugger Robot2020-04-221-5/+12
| |\| | | | | | | | | | | | | | Change-Id: I9e18b0e6a5e919b0346d0edad0c4e12e763c49fa
| | * | Merge "Set min_sdk_version to be part of mainline modules"Treehugger Robot2020-04-221-5/+12
| | |\ \
| | | * | Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-231-5/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
* | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b807e1d -s ours am skip reason: subject contains skip directive Change-Id: Ie9cc74b29545a74070e39ce3b0d66a85a4e87011
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I15ed3fefee5678a9ab83f52fc0c4d4d3dd9dbcaf
| | * \ \ Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731fKris Alder2020-04-0915-11/+201
| | |\ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I102fd257b225a51cd4d4c9e3205b12bb21a2e532
* | | | | Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731fKris Alder2020-04-0915-11/+201
|\| | | | | |_|_|/ |/| | | | | | | Change-Id: Ie5c84f6923184c564793de5e5f0007bc197415e7
| * | | Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400Kris Alder2020-04-0915-11/+201
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: Id2c7f9213d42db6897c3d8cc1fd14c0126fb8bb1
| | * Merge changes Iad37ae76,I4870251b,Icd937cadKris Alder2020-04-0915-11/+201
| |/| | | | | | | | | | | | | | | | | | | * changes: Added aac_dec_fuzzer aacdec: Add host support Stop using __DATE__/__TIME__ on all builds
| | * Added aac_dec_fuzzerAnuj Joshi2020-03-273-0/+182
| | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 151595970 Change-Id: Iad37ae766288e9490520d858a6de0dd755e70681
| | * aacdec: Add host supportAnuj Joshi2020-03-271-0/+7
| | | | | | | | | | | | | | | | | | | | | Test: Build libFraunhoferAAC on host Bug: 151595970 Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c
| | * Stop using __DATE__/__TIME__ on all buildsAnuj Joshi2020-03-2712-11/+12
| |/ | | | | | | | | | | | | Test: mmma external/libaac Bug: 151595970 Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
* | Remove outdated apply_normalization parameter from legacy DRC module.Fraunhofer IIS FDK2020-02-144-24/+3
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9b894007fc9d80da6aaee09d84c2b356f2c06ff7
* | Avoid decoder internal clipping by converting the whole audio sample data ↵Fraunhofer IIS FDK2020-02-1441-442/+488
| | | | | | | | | | | | | | | | path from 16 to 32 bit data width (FDKdec v3.2.0). Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I8a504ab709e42e27a61fe29840212953742283a5
* | Create new applyDrcLevelNormalization() function for subsequent usage.Fraunhofer IIS FDK2020-02-143-2/+222
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I23cc3081ff71830bc96766a31131594499dbdd04
* | Revise memory overlay usage and remove deprecated buffers and overlay tags.Fraunhofer IIS FDK2020-02-145-30/+9
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I7aea2898a3c49e06209fae89d734939c100e1184
* | Restructure QMF implementation and provide 16/32 bit implementation in parallel.Fraunhofer IIS FDK2020-02-145-373/+318
| | | | | | | | | | | | Bug: 149514474 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I2c6b332a0b5c4966a3f680d7a4d562d9bf18752c
* | Enhance encoder audio quality for vbr (FDKenc v4.0.1).Fraunhofer IIS FDK2020-02-136-48/+36
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I4af82bd104a94710d1977eaa0bd086aa743d3adf
* | Improve encoder audio quality for low bitreservoir configuration.Fraunhofer IIS FDK2020-02-131-4/+7
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I87d5695a93b1f130b95b45d48157e6aaf947709d
* | Fix SBR encoder element mapping for channel configurations with more than ↵Fraunhofer IIS FDK2020-02-131-1/+27
| | | | | | | | | | | | | | | | one layer Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: I8cd9e7f9aaeb62629f916f8d0dba7422d9a5e878
* | Ensure that QC_OUT_CHANNEL struct in encoder always uses aligned memoryFraunhofer IIS FDK2020-02-132-4/+4
| | | | | | | | | | | | Bug: 149489652 Test: atest android.media.cts.EncoderTest#testAACEncoders Change-Id: Ifc513ef20639f04c7252ade5519cc8e8c2fdbd50
* | Revise and straighten out pointless description from encoder documentationFraunhofer IIS FDK2020-02-132-32/+9
| | | | | | | | | | | | Bug: 149481606 Test: header doc update, so just make Change-Id: If5c7fcf96f97a3a1e8ee06bd24fb247c094508bd
* | Revise and straighten out useless references from decoder documentation.Fraunhofer IIS FDK2020-02-132-72/+44
| | | | | | | | | | | | Bug: 149481606 Test: doc update in header, so just make Change-Id: I656e76762ee336931d4f1938e5c39c8ad7f65954
* | Extend decoder API with audio output loudness info (FDKdec v3.1.3).Fraunhofer IIS FDK2020-02-118-19/+71
| | | | | | | | | | | | Bug: 148385721 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I68b09883def21baef259c9ab914922567ab8cee3
* | Merge "Request for Expert and Anchor loudness by default."Jean-Michel Trivi2020-01-271-2/+2
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 02:50:03 +0000