Commit Graph

1053 Commits

Author SHA1 Message Date
Kris Alder 43fb529e06 Merge "Added fuzz_config field in aac_dec_fuzzer" 2020-05-21 19:37:30 +00:00
Ayushi Khopkar 64e4f25b29 Added fuzz_config field in aac_dec_fuzzer
Test: ./aac_dec_fuzzer
Bug: 156871294

Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
2020-05-19 11:59:34 +05:30
Jooyung Han d6b557a3b2 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours am: d4b4152be0 -s ours
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history

Change-Id: Ib0f01bde91a3b106189590c9fb4eda78ebbd3bcb
2020-05-11 08:41:19 +00:00
Jooyung Han fcd9348524 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 -s ours
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history

Change-Id: Id12352863d662df8517a57f6334bb2268c79b1e1
2020-05-11 08:41:06 +00:00
Jooyung Han d4b4152be0 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history

Change-Id: Ib442bb5ad9e4d17b8c900e1afab96aca86d09c52
2020-05-11 08:21:30 +00:00
Jooyung Han b6b6120ac8 Set min_sdk_version to be part of mainline modules am: 71c477bae4
Change-Id: Iab6ac89228254383926bcb569f8e211920e24650
2020-05-11 08:21:16 +00:00
Jooyung Han 71c477bae4 Set min_sdk_version to be part of mainline modules
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 d40f05a618)
2020-05-11 07:01:25 +00:00
Treehugger Robot 81352d07d7 Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 am: 33de11d223
Change-Id: I4960f573cd714dbdb1c20327f383cb45c983170b
2020-05-04 19:46:21 +00:00
Treehugger Robot 33de11d223 Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235
Change-Id: If7805235d362630a3cd22e16d5d7a52bfae10157
2020-05-04 19:33:36 +00:00
Treehugger Robot 1f88875235 Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a
Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
2020-05-04 19:19:30 +00:00
Treehugger Robot 49a9939e4a Merge "Add METADATA to aac: Apache2=NOTICE" 2020-05-04 19:04:45 +00:00
Bob Badour 4f10c70ca2 Add METADATA to aac: Apache2=NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I71f5c419c31c1758d4ee49158d40a50aef6abf5d
2020-04-28 09:39:28 -07:00
Treehugger Robot e09f99be0f Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d am: 25647c87aa am: fd16a67308
Change-Id: Ie3494273b1a29ddd4148993ff2cd23557a2f52b0
2020-04-22 17:58:15 +00:00
Treehugger Robot fd16a67308 Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d am: 25647c87aa
Change-Id: Id09d8cf7f25b3a6aaffc1a3414db290058921ff2
2020-04-22 17:46:09 +00:00
Treehugger Robot 25647c87aa Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d
Change-Id: I9e18b0e6a5e919b0346d0edad0c4e12e763c49fa
2020-04-22 17:28:31 +00:00
Treehugger Robot 2611a48c1d Merge "Set min_sdk_version to be part of mainline modules" 2020-04-22 17:12:27 +00:00
Jooyung Han d40f05a618 Set min_sdk_version to be part of mainline modules
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
2020-04-23 01:01:46 +09:00
Xin Li 84a6b90591 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 920b807e1d -s ours am: 51993fe7bc
Change-Id: I8ab66d34f185ddb9191bc8583fd51eb1eb36c57c
2020-04-10 03:06:51 +00:00
Xin Li 51993fe7bc [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 920b807e1d -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9cc74b29545a74070e39ce3b0d66a85a4e87011
2020-04-10 02:29:13 +00:00
Xin Li 920b807e1d DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I15ed3fefee5678a9ab83f52fc0c4d4d3dd9dbcaf
2020-04-09 17:50:34 -07:00
Kris Alder 2b45df88f6 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f am: 0f130d51b8
Change-Id: Id0ab338ed4f6cce21e4983bd2903faa56eadc51b
2020-04-09 16:58:21 +00:00
Kris Alder 0699408153 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f
Change-Id: I102fd257b225a51cd4d4c9e3205b12bb21a2e532
2020-04-09 16:47:36 +00:00
Kris Alder 0f130d51b8 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f
Change-Id: Ie5c84f6923184c564793de5e5f0007bc197415e7
2020-04-09 16:47:26 +00:00
Kris Alder 0b8c6e731f Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400
Change-Id: Id2c7f9213d42db6897c3d8cc1fd14c0126fb8bb1
2020-04-09 16:35:10 +00:00
Kris Alder 662d974400 Merge changes Iad37ae76,I4870251b,Icd937cad
* changes:
  Added aac_dec_fuzzer
  aacdec: Add host support
  Stop using __DATE__/__TIME__ on all builds
2020-04-09 16:19:32 +00:00
Anuj Joshi d41cddf9e9 Added aac_dec_fuzzer
Test: ./aac_dec_fuzzer
Bug: 151595970

Change-Id: Iad37ae766288e9490520d858a6de0dd755e70681
2020-03-27 11:11:27 +05:30
Anuj Joshi b09c5ae9f0 aacdec: Add host support
Test: Build libFraunhoferAAC on host
Bug: 151595970

Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c
2020-03-27 11:09:30 +05:30
Anuj Joshi 7f7bbce892 Stop using __DATE__/__TIME__ on all builds
Test: mmma external/libaac
Bug: 151595970

Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
2020-03-27 10:43:38 +05:30
Fraunhofer IIS FDK 261fadc3a2 Remove outdated apply_normalization parameter from legacy DRC module.
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9b894007fc9d80da6aaee09d84c2b356f2c06ff7
2020-02-14 10:56:10 -08:00
Fraunhofer IIS FDK e016635f0d Avoid decoder internal clipping by converting the whole audio sample data path from 16 to 32 bit data width (FDKdec v3.2.0).
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I8a504ab709e42e27a61fe29840212953742283a5
2020-02-14 10:53:51 -08:00
Fraunhofer IIS FDK 57c9355de0 Create new applyDrcLevelNormalization() function for subsequent usage.
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I23cc3081ff71830bc96766a31131594499dbdd04
2020-02-14 10:47:19 -08:00
Fraunhofer IIS FDK 90c29e0808 Revise memory overlay usage and remove deprecated buffers and overlay tags.
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I7aea2898a3c49e06209fae89d734939c100e1184
2020-02-14 10:44:10 -08:00
Fraunhofer IIS FDK 5482443193 Restructure QMF implementation and provide 16/32 bit implementation in parallel.
Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I2c6b332a0b5c4966a3f680d7a4d562d9bf18752c
2020-02-14 08:51:24 -08:00
Fraunhofer IIS FDK 443d38963e Enhance encoder audio quality for vbr (FDKenc v4.0.1).
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I4af82bd104a94710d1977eaa0bd086aa743d3adf
2020-02-13 14:58:49 -08:00
Fraunhofer IIS FDK 79305e068e Improve encoder audio quality for low bitreservoir configuration.
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I87d5695a93b1f130b95b45d48157e6aaf947709d
2020-02-13 14:48:27 -08:00
Fraunhofer IIS FDK 6b0aab087d Fix SBR encoder element mapping for channel configurations with more than one layer
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: I8cd9e7f9aaeb62629f916f8d0dba7422d9a5e878
2020-02-13 14:41:18 -08:00
Fraunhofer IIS FDK 7b5389e63f Ensure that QC_OUT_CHANNEL struct in encoder always uses aligned memory
Bug: 149489652
Test: atest android.media.cts.EncoderTest#testAACEncoders
Change-Id: Ifc513ef20639f04c7252ade5519cc8e8c2fdbd50
2020-02-13 14:39:47 -08:00
Fraunhofer IIS FDK 925092e8fc Revise and straighten out pointless description from encoder documentation
Bug: 149481606
Test: header doc update, so just make
Change-Id: If5c7fcf96f97a3a1e8ee06bd24fb247c094508bd
2020-02-13 09:07:40 -08:00
Fraunhofer IIS FDK 1d451971ca Revise and straighten out useless references from decoder documentation.
Bug: 149481606
Test: doc update in header, so just make
Change-Id: I656e76762ee336931d4f1938e5c39c8ad7f65954
2020-02-13 08:59:36 -08:00
Fraunhofer IIS FDK 31f66f6d3f Extend decoder API with audio output loudness info (FDKdec v3.1.3).
Bug: 148385721
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I68b09883def21baef259c9ab914922567ab8cee3
2020-02-11 16:02:32 -08:00
Jean-Michel Trivi 3255d513ce Merge "Request for Expert and Anchor loudness by default." 2020-01-27 21:58:24 +00:00
Fraunhofer IIS FDK 7d437ef090 Request for Expert and Anchor loudness by default.
Bug: 148385721
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I06b116b7d144b6959705119908a9db27946a0adb
2020-01-27 11:34:17 -08:00
Fraunhofer IIS FDK 00285819a2 Fix AACDEC_INTR handling for USAC configuration with multiple pre-roll AUs
Bug: 148384920
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I88cd6da0b18c73f7b521ea58ba8b8f364278b64f
2020-01-27 09:21:21 -08:00
Fraunhofer IIS FDK f04a8a855c Do not allow channel configuration change within PCE for ADTS. Fixes assert.
Bug: 146938557
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Icba99bd0eeba1f94298bdd08b85f1b0cb3cf241b
2020-01-23 12:24:56 -08:00
Fraunhofer IIS FDK 262c9f28ec Avoid negative valid bits in adtsRead_DecodeHeader()
Avoid negative valid bits in adtsRead_DecodeHeader()
and prevent unsigned integer overflow.

Bug: 146937602
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I264ff99e0461352ae5c2b2031393b67a7fa44571
2020-01-23 09:48:54 -08:00
TreeHugger Robot 814859ba72 Merge "Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams containing legacy DRC info." 2020-01-22 23:18:35 +00:00
Jean-Michel Trivi 44b9543d92 Merge "Perform sanity check on DRC sets and improve the selection process" 2020-01-22 22:57:04 +00:00
Fraunhofer IIS FDK 7388c0732d Reject HE-AAC SBR with a ratio greater than 2:1 and reject USAC streams containing legacy DRC info.
Bug: 146937553
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I1a23d986160c1de07a7159ac026f57d821d3ff1d
2020-01-22 14:13:51 -08:00
Fraunhofer IIS FDK cedcc475f5 Reject undefined fPow() input data in _compressorIO_sigmoid_common().
Bug: 146938418
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iae4730ab5f5cef7c0ac8830831d25cfcaa567a99
2020-01-22 11:59:29 -08:00
Fraunhofer IIS FDK e323bf6cab Avoid undefined shift exponent in f2Pow().
Bug: 146938418
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Id28608e049244968158900848c23bf7a8298083d
2020-01-22 11:59:08 -08:00