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

442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
617c38c8cf Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to pi-platform-release 
Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
 2019-07-08 23:21:02 +00:00
android-build-team Robot
87820b2475 Snap for 5524043 from 6c72374eeaf99e2b9db1c8cb5c9f945311317a1c to pi-platform-release 
Change-Id: Ibe2a6ddf5f388db0403be3d99676aa0384d4094c
 2019-06-05 01:53:51 +00:00
android-build-team Robot
81b3f63562 Snap for 5526913 from b81f869de3f7c5b6395606d5f36cef57987eae8f to pi-qpr3-b-release 
Change-Id: I15a91b27f0bcef3b820d665017fa8d4d105ee33d
 2019-05-03 09:10:09 +00:00
android-build-team Robot
6c72374eea Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, 7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-release 
Change-Id: If9c7aea7b790ca80bfe8aea213d90c3308e5f5c1
 2019-04-16 22:42:01 +00:00
Fraunhofer IIS FDK
da401d271e Add sanity check in huff_decode() 
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 119292397
Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
(cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
 2019-04-16 22:38:25 +00:00
android-build-team Robot
2f481b47ab Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release 
Change-Id: I253904631907415999bad3cbcd4259896b8a3844
 2019-04-16 10:36:59 +00:00
Fraunhofer IIS FDK
18ac2d928d Add sanity check in huff_decode() 
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 119292397
Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
(cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
 2019-04-16 10:34:27 +00:00
android-build-team Robot
7a86a094a5 Snap for 5447620 from 69514bb3082c0f26a3684501240c982b79ecc22b to pi-qpr3-b-release 
Change-Id: I85690855119d1d87f317117f7454b99a1353a388
 2019-04-16 10:06:24 +00:00
android-build-team Robot
d1918a47fe Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, 7068987, 7068800, 7068004] into pi-qpr3-b-release 
Change-Id: I779161184ff3f9875b815efe88c9d12e046879e8
 2019-04-16 06:06:05 +00:00
Fraunhofer IIS FDK
f996972c32 Add sanity check in huff_decode() 
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 119292397
Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
(cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
 2019-04-16 06:05:05 +00: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
android-build-team Robot
44e7ae4d1e Snap for 5180536 from 75987acc798db1fe03002d04500dac994eb6d20c to pi-platform-release 
Change-Id: I5ebe5584689c6ac68fa82bef53068d114d4fc91f
 2019-02-09 02:17:39 +00:00
Bill Rassieur
33acbd97b6 Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245 
Change-Id: I1d3ce7e7d198f3256d3ecbd932f8d6f9977ba16d
 2018-12-04 16:59:15 +00:00
Bill Yi
a342c8b68c Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 
Change-Id: If3ff263d4f628f2c6d4ad3c28d0571284ca1f56d
 2018-11-28 18:34:17 -08:00
android-build-team Robot
9ea938f950 Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release 
Change-Id: Icee0cd3d40cc7982201e0afe5ba0307a936a8796
 2018-10-20 00:20:48 +00:00
Fraunhofer IIS FDK
5e57019525 Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE() 
Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
(cherry picked from commit 4dad829df00932b89858b9833cf5dcded8d97c37)
 2018-10-20 00:17:02 +00:00
Fraunhofer IIS FDK
0e5db9fee9 Unify audio element loop abort criterion in ER syntax 
Bug: 112891548
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
(cherry picked from commit f2bc07da2ed70eb069f3faab1179c4c89792bf3d)
 2018-10-20 00:17:00 +00:00
Fraunhofer IIS FDK
ce97e7d55e Always check whether given channel config is supported. 
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
(cherry picked from commit 25b209f229879a155759d791fe463b8abd283677)
 2018-10-20 00:16:57 +00:00
android-build-team Robot
75987acc79 Snap for 5066295 from 69514bb3082c0f26a3684501240c982b79ecc22b to pi-qpr2-release 
Change-Id: I918cab06ee2aa457d86fabb012484c2502762735
 2018-10-12 22:51:28 +00:00
Jean-Michel Trivi
69514bb308 [automerger skipped] Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 
am: 0ff211e4fb  -s ours

Change-Id: I4355b82503373ae3858a4f374ba62bbf923566ec
 2018-10-12 04:49:02 -07:00
Jean-Michel Trivi
0ff211e4fb Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea 
am: 1c4c4a8c97

Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
 2018-10-12 04:41:31 -07:00
Jean-Michel Trivi
1c4c4a8c97 Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 
am: 5a025c4fea

Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
 2018-10-12 04:33:58 -07:00
TreeHugger Robot
5a025c4fea Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 2018-10-12 11:26:30 +00:00
Jean-Michel Trivi
863b4b3b3f [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 
am: 14ea3dc906  -s ours

Change-Id: Ia03fc2d353c2a39318fa752f3c6f152c43bf6138
 2018-10-11 19:44:22 -07:00
Jean-Michel Trivi
14ea3dc906 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 
am: 162f98a177

Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
 2018-10-11 19:39:58 -07:00
Jean-Michel Trivi
162f98a177 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
am: 14fd59e8c4

Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
 2018-10-11 19:35:07 -07:00
Android Build Merger (Role)
14fd59e8c4 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
 2018-10-11 23:10:04 +00:00
Android Build Merger (Role)
c7e9a56431 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 
Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
 2018-10-11 23:10:03 +00:00
Android Build Merger (Role)
9c00c42d95 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 
Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
 2018-10-11 23:10:01 +00:00
Android Build Merger (Role)
e2491a2024 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f 
Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
 2018-10-11 23:10:00 +00:00
Android Build Merger (Role)
589e1e861f [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 
Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
 2018-10-11 23:09:59 +00:00
Jean-Michel Trivi
2eaadebcb6 DO NOT MERGE Prevent out of bounds accesses in lppTransposer() 
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I77bd1e1dfab3bac92b4522170bdc3c9eb56fdf82
 2018-10-11 23:09:57 +00:00
Jean-Michel Trivi
56ef80d7fe Prevent out of bounds accesses in lppTransposer() 
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I789030b116da7f8ea261001b43ef6c677dd58a3d
Merged-In: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
 2018-10-11 14:49:35 -07:00
android-build-team Robot
b4ffa34eb0 Snap for 5058880 from 927448349c11391dae98fe1581813ae7ea1520ad to pi-qpr2-release 
Change-Id: I29a06049a91662e96b50e7776d55bcc79123ad19
 2018-10-10 03:04:31 +00:00
Jean-Michel Trivi
927448349c Merge "Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()" into pi-dev 2018-10-08 21:20:57 +00:00
Fraunhofer IIS FDK
4dad829df0 Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE() 
Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
 2018-10-05 10:41:10 -07:00
android-build-team Robot
40b48a8231 Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to pi-qpr2-release 
Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
 2018-10-02 22:11:05 +00:00
Jean-Michel Trivi
28234107a7 Merge "Unify audio element loop abort criterion in ER syntax" into pi-dev 2018-10-01 22:19:05 +00:00
Fraunhofer IIS FDK
25b209f229 Always check whether given channel config is supported. 
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
 2018-09-28 16:47:37 +00:00
Fraunhofer IIS FDK
f2bc07da2e Unify audio element loop abort criterion in ER syntax 
Bug: 112891548
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
 2018-09-27 14:28:50 -07:00
android-build-team Robot
b97c2a93f2 Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release 
Change-Id: Ib805bf06d51e2a7e6f0d9bf2676dc1f21b6cbb9e
 2018-09-10 23:21:17 +00:00
Fraunhofer IIS FDK
9744e41c40 Prevent bit buffer counter overflow. 
While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Bug: 112662184
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
(cherry picked from commit 15292f7e9620caf9e8df26a62efc2a2891ea822e)
 2018-09-10 23:19:19 +00:00
Fraunhofer IIS FDK
61381bd0f4 Break audio element loop in case element_count becomes too large. 
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
(cherry picked from commit 3347cfb91a7ecabf5800d72e936f04ce44752bf3)
 2018-09-10 23:19:16 +00:00
Fraunhofer IIS FDK
c2208f2a30 Add sampling rate sanity check 
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
(cherry picked from commit ba003785774efe355bcac950158fc78a0cff0c2b)
 2018-09-10 23:19:14 +00:00
Jean-Michel Trivi
42f714f2ab Merge "Prevent bit buffer counter overflow." into pi-dev 2018-09-06 23:02:17 +00:00
Jean-Michel Trivi
4d801e44ba Merge "Break audio element loop in case element_count becomes too large." into pi-dev 2018-09-06 21:15:30 +00:00
TreeHugger Robot
b3ea08e059 Merge "Prevent overflow in concealment clipping check" into pi-dev 2018-09-06 20:17:07 +00:00
Fraunhofer IIS FDK
f44b50b835 Prevent overflow in concealment clipping check 
Bug: 112890225
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
 2018-09-05 15:03:18 -07:00
Fraunhofer IIS FDK
3347cfb91a Break audio element loop in case element_count becomes too large. 
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
 2018-09-05 14:54:44 -07:00
Fraunhofer IIS FDK
ba00378577 Add sampling rate sanity check 
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
 2018-09-05 14:05:32 -07:00