1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-08 23:58:38 +01:00

771 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK
035cf671b8 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I9a57636513443249a25c6789ed2eb975cf91b45c
2020-09-09 22:02:20 +00:00
Fraunhofer IIS FDK
17dd8dfad9 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I41058bf1a076509c564defa70247dcbfa91c64d0
2020-09-09 22:02:14 +00:00
Fraunhofer IIS FDK
80ebc985fb [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Iad32917ed1a93b0a8749e6cad3555481a570943d
2020-09-09 21:55:03 +00:00
Fraunhofer IIS FDK
d20df7ee14 [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I0f5863139bc848401b905625fdc572793755b8cf
2020-09-09 21:44:15 +00:00
Fraunhofer IIS FDK
0468e02e5b [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I40c07a02e1528540b24a5380cff1249ed5076193
2020-09-09 21:29:48 +00:00
Fraunhofer IIS FDK
c516539a20 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
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
Change-Id: I8569a15214707ab622e986b34b4b917251495662
2020-07-09 08:56:14 -07:00
Fraunhofer IIS FDK
50aa5be388 [DO NOT MERGE] 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 DecoderTestXheAac
Change-Id: I741f49ab3b675fa3d3217ee72e1db66b0114f7ee
2020-07-06 21:42:07 +00:00
Fraunhofer IIS FDK
5def92cb0f Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()
Bug: 121226473
Test: see bug with specific audio stream to encode
Change-Id: I282506f0856130fa00c7f7c6e94b18e1162c8593
2019-05-16 21:07:20 +00:00
Fraunhofer IIS FDK
55002323b3 Fix integer overflow in FDKaacEnc_IntensityStereoProcessing().
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Id2a7e26fff499146a39cea757b1b7fc787b54b31
2019-05-15 12:31:19 -07:00
Fraunhofer IIS FDK
f6a6a071a9 Improve phase coding accuracy by use of splitAngle lookup table.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I7fd83b478f4156a0abb7ac42cd6d9b6cf0ac8b91
2019-05-14 14:18:25 -07:00
Fraunhofer IIS FDK
818743f718 Improve random phase table accuracy.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Ifca82aec87c0d21871d1f181b1be635c419433ee
2019-05-14 14:13:38 -07:00
Fraunhofer IIS FDK
2ef020c93a Increase scale factor gain in TES tool.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I498be80902da32944ab456436689ca4aba42d3f6
2019-05-14 14:10:18 -07:00
Fraunhofer IIS FDK
69a5c189ad Improve accuracy of division in calcSubbandGain().
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I3beeda23355ae1200d9f55c9e8cd1cc6bc899153
2019-05-14 09:53:45 -07:00
Fraunhofer IIS FDK
e51063ca54 Avoid -1.0 autocorrelation input data.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I2d4ccf9ee666a5533417ea98302de4a01b74c5ce
2019-05-14 09:47:32 -07:00
Fraunhofer IIS FDK
ce00007148 Increase scale factor to avoid overflows in function factorCLD().
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I8f5f67375b3413cce855bddc18ce0546caa01062
2019-05-14 09:30:37 -07:00
Fraunhofer IIS FDK
1b5457fe93 Fix out of sync function declaration of scaleValues().
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I1b9a204c52aee20adabc1baee7f5e5cdbf1ee39e
2019-05-14 09:13:11 -07:00
Fraunhofer IIS FDK
89ca476e52 Fetch multiple samples of input channels from encoder input buffer.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I548c62efcbe2629479f671befd4388895d835de7
2019-05-14 09:09:19 -07:00
Fraunhofer IIS FDK
e970ac4c95 Fix HE-AAC using MPEG-D DRC with implicit SBR signaling.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I97c5d3972528092f627153ad3127c7db977a0e5d
2019-05-13 15:24:51 -07:00
Fraunhofer IIS FDK
14f7e13693 MPEG-4/D DRC unification, loudness norm default at -24
Unify API parameter of MPEG-4/D DRC and introduce rounding to boost/compress setParam function (FDKdec v3.1.1).

Enable Loudness Normalization with target loudness -24 by default (FDKdec v3.1.2).

Bug: 131255165
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I249a36b4861d0c8d4a0ed2df4dc1f444576bac6b
2019-04-25 09:35:00 -07:00
Fraunhofer IIS FDK
37972d5a1f Add support for Album Mode (FDKdec v3.1.0).
Bug: 131255165
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I6b4b176ec497587238537bddd89889341733d4e2
2019-04-24 22:56:19 +00:00
Fraunhofer IIS FDK
67a2c092f5 Add sanity check in huff_decode()
am: b81f869de3

Change-Id: Id5a12cd85e70b3ec017e04212db6f922fb3f64bd
2019-04-10 11:30:48 -07:00
Fraunhofer IIS FDK
b81f869de3 Add sanity check in huff_decode()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 119292397
Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
2019-04-09 12:05:51 -07:00
Fraunhofer IIS FDK
592c03a9f0 Reset parameter smoothing tool while concealment.
Change-Id: I9ec328096e88f5de984daca85a87c200827e7048
2019-03-15 18:57:14 +00:00
Fraunhofer IIS FDK
273a43f61f Discard SBR data in case of unsuccessful SBR header update.
Change-Id: I31ab01476d5a9de273c7adce14a1c29fa0023682
2019-03-15 18:10:11 +00:00
Jean-Michel Trivi
97b421ce43 Merge "Trigger config change after a change in SBR activity has been recognized." 2019-03-15 18:07:26 +00:00
Fraunhofer IIS FDK
856e3d339e Trigger config change after a change in SBR activity has been recognized.
Change-Id: I7715e61fdfcd16dfae6029171888aef9c6f0738e
2019-03-15 10:32:59 -07:00
TreeHugger Robot
1e0313fb04 Merge "Clear config in case of parsing error in drcDec_readUniDrc()" 2019-03-15 02:15:59 +00:00
Jean-Michel Trivi
041424440a Merge "Clear config in case of parsing error in drcDec_readUniDrc()" 2019-03-14 22:08:07 +00:00
Fraunhofer IIS FDK
a1f6034653 Clear config in case of parsing error in drcDec_readUniDrc()
Change-Id: I827a1ddbed2cf10e6b4fabdea2bf3f71c8f30c6f
2019-03-14 15:01:30 -07:00
TreeHugger Robot
358e6d14ac Merge "Always call startSelectionProcess() independent on an error in FDK_drcDec_ReadUniDrc()" 2019-03-14 20:20:28 +00:00
Fraunhofer IIS FDK
1f908ac9b0 Add MPEG-D DRC sanity checks
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I5413e43d5cfc895b8c3171f8857ca6feab6c269e
2019-03-14 08:58:57 -07:00
Fraunhofer IIS FDK
2bd9404254 Always call startSelectionProcess() independent on an error in FDK_drcDec_ReadUniDrc()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Ie7fdb69ea7a6d68b14b9fa06e68c86496cb01a02
2019-03-14 08:56:59 -07:00
Fraunhofer IIS FDK
c2e0dfe237 Clear config in case of parsing error in drcDec_readUniDrc()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic1a12cbd31aa51d8a89bc4d6a67f9b0289265b6c
2019-03-14 08:53:44 -07:00
Jean-Michel Trivi
f164a97189 Merge "AAC decoder: fix use of uninitialized value, check index" 2019-03-08 14:52:26 +00:00
TreeHugger Robot
ea08af4499 Merge "libSBRdec: prevent OOB access" 2019-03-08 10:27:16 +00:00
Jean-Michel Trivi
8e27e0bd30 AAC decoder: fix use of uninitialized value, check index
Initialize aInterpolate int array in mapIndexData().
Prevent index from accessing OOB value.

Bug: 120426980
Test: see bug
Change-Id: Ib9f1b5e143802d3d662af36fedcae8bf47ff09bc
2019-03-07 15:04:08 -08:00
Jean-Michel Trivi
8972e93edd libSBRdec: prevent OOB access
In generateFixFixOnly() check validity of  index before accessing
  SBR decoder envolope tables.

Bug: 112052062
Test: see bug
Change-Id: Icd7ec3807eea9ef8417dba7383f361101becc4f2
2019-03-07 14:16:05 -08:00
Jean-Michel Trivi
0309455012 libMpegTPDec: fix use of uninitialized value in OutOfBandConfig
Initialize tmpConf in transportDec_OutOfBandConfig

Bug: 120426166
Test: see bug
Change-Id: I72ac8bc96a7d386ffe32acd669c78c4a581d52dc
2019-03-07 13:15:15 -08:00
Xin Li
3e8d8ba558 Merge stage-aosp-master into pi-dev-plus-aosp
am: 719ad2e600

Change-Id: I2eda96b8a597569263b841f21b66b55b5e9a4971
2019-02-25 05:06:17 -08:00
Xin Li
719ad2e600 Merge stage-aosp-master into pi-dev-plus-aosp
Bug: 126125118
Change-Id: If648fc23ea1edee18f0bf264b7b35aac504a25b5
2019-02-25 00:27:38 -08:00
Xin Li
b6be942529 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I1bbe11b78b2f06f948be0e04fcae6582bad9cc21
2019-02-20 16:18:11 -08:00
Xin Li
5761bd24ee [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours
am: 2ef1b029ce -s ours
am skip reason: subject contains skip directive

Change-Id: I9f869083551264692a4efe9d94a8085ba2ace4d0
2019-02-20 11:17:33 -08:00
Xin Li
0de71dd7a4 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 7ac13ae4aa -s ours am: b3537f907a -s ours
am: 9d138bd1e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I241eff03f8e88fb2cef002ade4f415d42759b1fd
2019-02-20 10:09:38 -08:00
Xin Li
2ef1b029ce [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d5724aefe9 -s ours
am: 2dd3e2e6c9 -s ours
am skip reason: subject contains skip directive

Change-Id: I33bcb484a7e06e1f38cbd7dc9e25faccdc7feede
2019-02-20 10:05:48 -08:00
Xin Li
2dd3e2e6c9 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: d5724aefe9 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b7fecb7f6abba1645b3a201c9ae9bf57b22882e
2019-02-20 09:59:47 -08:00
Xin Li
9d138bd1e3 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 7ac13ae4aa -s ours
am: b3537f907a -s ours
am skip reason: subject contains skip directive

Change-Id: Icc01260ec9ce2a2c3b5122327293ca2dc69976ce
2019-02-20 09:18:20 -08:00
Xin Li
b3537f907a [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 7ac13ae4aa -s ours
am skip reason: subject contains skip directive

Change-Id: Iadf52d35e2cf2a963d0a9b78cbcf7a8320d3b27d
2019-02-20 08:40:25 -08:00
Xin Li
d5724aefe9 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:25:58 +00:00
Xin Li
7ac13ae4aa DO NOT MERGE - Merge PPRL.190205.001 into master
Bug: 124234733
Change-Id: Ib53d396a2651013248e3f1a9f0bc68556f747274
2019-02-18 15:58:24 -08:00
Xin Li
5edfde47c5 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 8e6b62378b -s ours
am: 1e76f33d25 -s ours
am skip reason: subject contains skip directive

Change-Id: I20b3c6186d964c2111c32e98032f988563459517
2019-02-14 20:57:54 -08:00