aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to ↵android-build-team Robot2019-07-080-0/+0
|\ | | | | | | | | | | pi-platform-release Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
| * Snap for 5526913 from b81f869de3f7c5b6395606d5f36cef57987eae8f to ↵android-build-team Robot2019-05-030-0/+0
| |\ | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I15a91b27f0bcef3b820d665017fa8d4d105ee33d
| | * Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-091-0/+8
| | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
| * | Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, ↵android-build-team Robot2019-04-161-0/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release Change-Id: I253904631907415999bad3cbcd4259896b8a3844
| | * | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| |/ / | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
| * | Snap for 5447620 from 69514bb3082c0f26a3684501240c982b79ecc22b to ↵android-build-team Robot2019-04-161-8/+0
| |\| | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I85690855119d1d87f317117f7454b99a1353a388
| * | Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, ↵android-build-team Robot2019-04-161-0/+8
| |\ \ | | |/ | |/| | | | | | | | | | 7068987, 7068800, 7068004] into pi-qpr3-b-release Change-Id: I779161184ff3f9875b815efe88c9d12e046879e8
| | * Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| |/ | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
* | Snap for 5524043 from 6c72374eeaf99e2b9db1c8cb5c9f945311317a1c to ↵android-build-team Robot2019-06-051-0/+8
|\ \ | | | | | | | | | | | | | | | pi-platform-release Change-Id: Ibe2a6ddf5f388db0403be3d99676aa0384d4094c
| * \ Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, ↵android-build-team Robot2019-04-161-0/+8
| |\ \ | | |/ | |/| | | | | | | | | | 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
| | * Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| |/ | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
* | Snap for 5180536 from 75987acc798db1fe03002d04500dac994eb6d20c to ↵android-build-team Robot2019-02-091-4/+4
|\ \ | | | | | | | | | | | | | | | pi-platform-release Change-Id: I5ebe5584689c6ac68fa82bef53068d114d4fc91f
| * | Snap for 5066295 from 69514bb3082c0f26a3684501240c982b79ecc22b to ↵android-build-team Robot2018-10-120-0/+0
| |\| | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I918cab06ee2aa457d86fabb012484c2502762735
| | * [automerger skipped] Merge "Prevent out of bounds accesses in ↵Jean-Michel Trivi2018-10-120-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 am: 0ff211e4fb -s ours Change-Id: I4355b82503373ae3858a4f374ba62bbf923566ec
| | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: ↵Jean-Michel Trivi2018-10-122-13/+27
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a025c4fea am: 1c4c4a8c97 Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
| | | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devJean-Michel Trivi2018-10-122-13/+27
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5a025c4fea Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
| | | | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devTreeHugger Robot2018-10-122-13/+27
| | | | | |\
| | | | | | * Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-112-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds ↵Jean-Michel Trivi2018-10-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 am: 14ea3dc906 -s ours Change-Id: Ia03fc2d353c2a39318fa752f3c6f152c43bf6138
| | | * | | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
| | | | * | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
| | | | | * | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-110-0/+0
| | | | | |\ \ | | | | | | |/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
| | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
| | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
| | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
| | | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
| | | | | | | | | | * DO NOT MERGE Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-111-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Snap for 5058880 from 927448349c11391dae98fe1581813ae7ea1520ad to ↵android-build-team Robot2018-10-102-27/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I29a06049a91662e96b50e7776d55bcc79123ad19
| | * | | | | | | | | Merge "Prevent out of bounds accesses in lppTransposer() and ↵Jean-Michel Trivi2018-10-082-27/+50
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lppTransposerHBE()" into pi-dev
| | | * | | | | | | | | Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()Fraunhofer IIS FDK2018-10-052-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112160868 Test: see poc in bug Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
| * | | | | | | | | | | Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to ↵android-build-team Robot2018-10-022-22/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
| | * | | | | | | | | | Merge "Unify audio element loop abort criterion in ER syntax" into pi-devJean-Michel Trivi2018-10-011-7/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Unify audio element loop abort criterion in ER syntaxFraunhofer IIS FDK2018-09-271-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891548 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
| | * | | | | | | | | | | Always check whether given channel config is supported.Fraunhofer IIS FDK2018-09-281-11/+3
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112660981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
| | * | | | | | | | | | Merge "Prevent bit buffer counter overflow." into pi-devJean-Michel Trivi2018-09-0612-166/+91
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Prevent bit buffer counter overflow.Fraunhofer IIS FDK2018-08-1712-166/+91
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Merge "Break audio element loop in case element_count becomes too large." ↵Jean-Michel Trivi2018-09-061-1/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pi-dev
| | | * | | | | | | | | | Break audio element loop in case element_count becomes too large.Fraunhofer IIS FDK2018-09-051-1/+24
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
| | * | | | | | | | | | Merge "Prevent overflow in concealment clipping check" into pi-devTreeHugger Robot2018-09-061-4/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Prevent overflow in concealment clipping checkFraunhofer IIS FDK2018-09-051-4/+4
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112890225 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
| | * / / / / / / / / / Add sampling rate sanity checkFraunhofer IIS FDK2018-09-051-1/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112661641 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
* | | | | | | | | | | Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform ↵Bill Rassieur2018-12-043-45/+57
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release.\n\nBUG: 120448245 Change-Id: I1d3ce7e7d198f3256d3ecbd932f8d6f9977ba16d
| * \ \ \ \ \ \ \ \ \ \ Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, ↵android-build-team Robot2018-10-203-45/+57
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()Fraunhofer IIS FDK2018-10-202-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112160868 Test: see poc in bug Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86 (cherry picked from commit 4dad829df00932b89858b9833cf5dcded8d97c37)
| | * | | | | | | | | | Unify audio element loop abort criterion in ER syntaxFraunhofer IIS FDK2018-10-201-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891548 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392 (cherry picked from commit f2bc07da2ed70eb069f3faab1179c4c89792bf3d)
| | * | | | | | | | | | Always check whether given channel config is supported.Fraunhofer IIS FDK2018-10-201-11/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112660981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba (cherry picked from commit 25b209f229879a155759d791fe463b8abd283677)
* | | | | | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-2814-168/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3ff263d4f628f2c6d4ad3c28d0571284ca1f56d
| * | | | | | | | | | Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, ↵android-build-team Robot2018-09-1014-168/+118
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Prevent bit buffer counter overflow.Fraunhofer IIS FDK2018-09-1012-166/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | | | | | Break audio element loop in case element_count becomes too large.Fraunhofer IIS FDK2018-09-101-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199 (cherry picked from commit 3347cfb91a7ecabf5800d72e936f04ce44752bf3)