aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\ | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: Id12352863d662df8517a57f6334bb2268c79b1e1
| * Set min_sdk_version to be part of mainline modules am: 71c477bae4Jooyung Han2020-05-111-0/+7
| |\ | | | | | | | | | Change-Id: Iab6ac89228254383926bcb569f8e211920e24650
| | * 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: 1f88875235 ↵Treehugger Robot2020-05-041-0/+3
|\ \ | | | | | | | | | | | | | | | am: 33de11d223 Change-Id: I4960f573cd714dbdb1c20327f383cb45c983170b
| * \ 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 am: fd16a67308 Change-Id: Ie3494273b1a29ddd4148993ff2cd23557a2f52b0
| * | | | 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: 51993fe7bc Change-Id: I8ab66d34f185ddb9191bc8583fd51eb1eb36c57c
| * | | | [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: 0b8c6e731f ↵Kris Alder2020-04-0915-11/+201
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | am: 0f130d51b8 Change-Id: Id0ab338ed4f6cce21e4983bd2903faa56eadc51b
| * | | | 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
|\ \
| * | Request for Expert and Anchor loudness by default.Fraunhofer IIS FDK2020-01-271-2/+2
| | | | | | | | | | | | | | | | | | Bug: 148385721 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I06b116b7d144b6959705119908a9db27946a0adb
* | | Fix AACDEC_INTR handling for USAC configuration with multiple pre-roll AUsFraunhofer IIS FDK2020-01-271-3/+3
|/ / | | | | | | | | | | Bug: 148384920 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I88cd6da0b18c73f7b521ea58ba8b8f364278b64f
* | Do not allow channel configuration change within PCE for ADTS. Fixes assert.Fraunhofer IIS FDK2020-01-232-2/+41
| | | | | | | | | | | | | | Bug: 146938557 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Icba99bd0eeba1f94298bdd08b85f1b0cb3cf241b
* | Avoid negative valid bits in adtsRead_DecodeHeader()Fraunhofer IIS FDK2020-01-231-2/+8
| | | | | | | | | | | | | | | | | | Avoid negative valid bits in adtsRead_DecodeHeader() and prevent unsigned integer overflow. Bug: 146937602 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I264ff99e0461352ae5c2b2031393b67a7fa44571
* | Merge "Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC ↵TreeHugger Robot2020-01-221-7/+32
|\ \ | | | | | | | | | streams containing legacy DRC info."
| * | Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams ↵Fraunhofer IIS FDK2020-01-221-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | containing legacy DRC info. Bug: 146937553 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I1a23d986160c1de07a7159ac026f57d821d3ff1d
* | | Merge "Perform sanity check on DRC sets and improve the selection process"Jean-Michel Trivi2020-01-225-22/+88
|\ \ \ | |/ / |/| |
| * | Perform sanity check on DRC sets and improve the selection processFraunhofer IIS FDK2020-01-225-22/+88
| | | | | | | | | | | | | | | | | | | | | Bug: 137282770 Bug: 141883493 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie8e17c82653cb0d9adcdb10ec3f4875b6207ac6f
* | | Reject undefined fPow() input data in _compressorIO_sigmoid_common().Fraunhofer IIS FDK2020-01-221-1/+4
| | | | | | | | | | | | | | | | | | Bug: 146938418 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iae4730ab5f5cef7c0ac8830831d25cfcaa567a99
* | | Avoid undefined shift exponent in f2Pow().Fraunhofer IIS FDK2020-01-222-2/+8
|/ / | | | | | | | | | | Bug: 146938418 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Id28608e049244968158900848c23bf7a8298083d
* | Fix too large shift exponent in CConcealment_InterpolateBuffer().Fraunhofer IIS FDK2020-01-161-8/+3
| | | | | | | | | | | | Bug: 146938361 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Idb0a4e2c87962e453a991f0a573155ace6e9bf40
* | Prevent too large shift exponents in SpatialDecReshapeBBEnv().Fraunhofer IIS FDK2020-01-161-9/+14
| | | | | | | | | | | | Bug: 146937858 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I9fbe0b364ae4d329c6e5cc1109a111ef5def552d
* | Avoid too large shift exponent in apply_inter_tes() by using fIsLessThan.Fraunhofer IIS FDK2020-01-161-11/+2
| | | | | | | | | | | | Bug: 146936613 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8414072929ec8f786e0c003f18ab453dbacb9e5e