fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-18 04:00:36 +01:00
Code Issues Projects Releases Wiki Activity
1,012 Commits 10 Branches 11 Tags
Commit Graph

1012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
0e9a1509b5 Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release 
Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
 2020-09-16 23:30:07 +00:00
Fraunhofer IIS FDK
ffff95538e Fix heap buffer overflow in 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 DecoderTestAacFormat DecoderTestXheAac
Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
(cherry picked from commit bb8f983bf36ee2ad8af6acebf4823a58060004ab)
 2020-09-16 23:28:22 +00:00
android-build-team Robot
63d6409af1 Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-release 
Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
 2020-05-30 23:08:39 +00:00
Ray Essick
ebc1030f65 point to new repo hooks for mainline uploads 
Bug: 157501573
Test: upload
Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
 2020-05-26 16:29:58 -07:00
android-build-team Robot
d0f1ac8a7b Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-release 
Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
 2020-05-12 01:13:03 +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 d40f05a61897c4ba746dd2b383fff0c158026c1f)
 2020-05-11 07:01:25 +00:00
android-build-team Robot
304c811c9d Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-release 
Change-Id: I1d56321205dbd74479a72ecbbde137a18eef044b
 2020-02-16 00:16:00 +00:00
android-build-team Robot
4422539a92 Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-release 
Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
 2020-02-15 03:18:33 +00:00
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
android-build-team Robot
67aa964d42 Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-release 
Change-Id: Ide088e86f1ced06e7717f8d78d187058bc7db370
 2020-02-14 03:28:18 +00: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
android-build-team Robot
4e14250c10 Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-release 
Change-Id: Iefbacc1498ce7caf6c6ccb2df4c8b4c6cca4ab76
 2020-02-13 04:07:22 +00: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
android-build-team Robot
0ace500b9e Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-release 
Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
 2020-01-28 04:24:32 +00: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
android-build-team Robot
5d86489478 Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-release 
Change-Id: Icd800c3d313c30fc67595fc70baaf69b12188cd7
 2020-01-24 04:13:28 +00: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
android-build-team Robot
3a6eca5c66 Snap for 6154573 from cedcc475f52dd704497524dda6ec2ef430d2b6c5 to rvc-release 
Change-Id: I6edb0ebedba940eb136ae37bed4e010ee76f3d58
 2020-01-23 04:26:12 +00: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
Fraunhofer IIS FDK
3ce7751a44 Perform sanity check on DRC sets and improve the selection process 
Bug: 137282770
Bug: 141883493
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie8e17c82653cb0d9adcdb10ec3f4875b6207ac6f
 2020-01-22 11:11:56 -08:00
android-build-team Robot
7d1449b89a Snap for 6145313 from cee316ab3ebde92047b5e76d15c00768b92cb890 to rvc-release 
Change-Id: I642e8bbffa03f9c9e718eb115125c1e0fa852556
 2020-01-18 04:29:58 +00:00
android-build-team Robot
2dc3e5c1f2 Snap for 6142138 from 1020e48d6e76506ac85a7678fe950ce7245d3aea to rvc-release 
Change-Id: Icb323d1007194553c9b7494024ae7fab252696ee
 2020-01-17 04:06:03 +00:00
Fraunhofer IIS FDK
cee316ab3e Fix too large shift exponent in CConcealment_InterpolateBuffer(). 
Bug: 146938361
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idb0a4e2c87962e453a991f0a573155ace6e9bf40
 2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
1020e48d6e Fix IsLessThan() function for certain edge cases. 
Bug: 146936613
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idbec38c1df01bd7a6a48ac4b6e5673c30627fc73
 2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
86f7d2b69a Prevent too large shift exponents in SpatialDecReshapeBBEnv(). 
Bug: 146937858
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9fbe0b364ae4d329c6e5cc1109a111ef5def552d
 2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
e3b9058b8b Avoid unsigned integer overflows in FDK_Feed(). 
Bug: 146937030
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I7bd63c2fbfed2612c80d3334d1339e1cd215e034
 2020-01-16 12:15:04 -08:00
Fraunhofer IIS FDK
5d09563196 Avoid too large shift exponent in apply_inter_tes() by using fIsLessThan. 
Bug: 146936613
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8414072929ec8f786e0c003f18ab453dbacb9e5e
 2020-01-16 12:15:04 -08:00
android-build-team Robot
29c3f50d14 Snap for 6138855 from 063d5f30864c6293855da6f7b8dd482d7c408158 to rvc-release 
Change-Id: I76b653e2aa437267603833e7fade774c4d210243
 2020-01-16 04:25:38 +00:00
Fraunhofer IIS FDK
8fee7605df Prevent undefined syncLayerFrameBits in synchronization(). 
Bug: 146937540
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idaaa11d95c13220a9f96e6d73d4813492a740954
 2020-01-14 16:39:37 -08:00
Fraunhofer IIS FDK
8caa63f329 Avoid unsigned integer overflow in transportDec_InBandConfig() and transportDec_ReadAccessUnit(). 
Bug: 146937857
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: If2320f3a1ddf6a36c07338100481801a996e455d
 2020-01-14 16:38:28 -08:00
Fraunhofer IIS FDK
9ab63ce151 Prevent negation of INT_MIN in CConcealment_ApplyRandomSign(). 
Bug: 146937601
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9747110eca96b37604df996ef5e86ea58e2d8932
 2020-01-14 14:53:43 -08:00
Fraunhofer IIS FDK
3070b0e81b Revise scaling in extractBBEnv() to avoid potential signed integer overflows. 
Bug: 146936823
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I268f4ed2778ffad6cbd90e1df627daf2eab97604
 2020-01-14 14:52:18 -08:00
Fraunhofer IIS FDK
ed5a207a1f Avoid signed integer overflow in combineSignalCplx*(). 
Bug: 146937324
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3f5516085483ac349f9873e7267c6ff7f9c6f816
 2020-01-14 14:50:26 -08:00
Fraunhofer IIS FDK
1a0335287f Prevent signed integer overflow in TsdApply(). 
Bug: 146937678
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia7b58caf9eb86c19e3ae10b3cc624490b2a5f07b
 2020-01-14 14:49:15 -08:00