Xin Li
72e350f0c5
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: b857efbb10
-s ours
...
am: 3c54bd3b6d
-s ours
Change-Id: Id191de8883914ea170db9ac6a93cc4bcb9b62eb4
2018-12-11 15:30:55 -08:00
Xin Li
3c54bd3b6d
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: b857efbb10
-s ours
Change-Id: Id5e78fc0d96a4532c5f7d11721bad1b243767915
2018-12-11 15:01:58 -08:00
Xin Li
20c336953f
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
2018-12-11 13:59:07 -08:00
Xin Li
b857efbb10
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I4c81feb609ac0590877ce923099d3ae63577857d
2018-12-11 20:26:37 +00:00
Ivan Lozano
26a9da724f
Enable bounds sanitization in libaac.
...
Enables the UBSan bounds sanitizer in libaac. This adds bounds checks
around array accesses when the array size is known at compile time.
Bug: 117221610
Test: make -j
Test: Device boots.
Change-Id: Ib820c7ec6ef6bcbf98d8526ed213c90ab29169c2
2018-12-11 09:18:14 -08: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
Fraunhofer IIS FDK
bf8adf21ad
Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2
am: 6e4fe2e06b
...
am: 69e052a1af
Change-Id: I17eca04703b565d22659b6a3f8d08e16a818aedc
2018-11-29 11:05:17 -08:00
Fraunhofer IIS FDK
69e052a1af
Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2
...
am: 6e4fe2e06b
Change-Id: Ie017463a9aad54c9b02672c0aa4d1e7f06847427
2018-11-29 11:00:16 -08:00
Fraunhofer IIS FDK
6e4fe2e06b
Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"
...
am: d2be744af2
Change-Id: I780b6c3791bd9bc70fa11a6990cb95a2e5d5ae7c
2018-11-29 10:56:23 -08:00
Treehugger Robot
d2be744af2
Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"
2018-11-29 18:43:33 +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
Fraunhofer IIS FDK
24648cbd4f
Integer overflow fix in InvMdctTransformLowDelay_fdk()
...
Bug: 112892194
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I47fdb5b51afd8c588607bf206d4ae3ef4ba1cdb3
2018-11-28 18:09:43 -05:00
Fraunhofer IIS FDK
619b24da33
[automerger skipped] Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cd
am: 9cfaf0cd45
...
am: 07ed1f756b
-s ours
Change-Id: I5a31c35f9c4e78d76a932bf132b063424d5faf20
2018-11-28 13:58:59 -08:00
Fraunhofer IIS FDK
07ed1f756b
Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cd
...
am: 9cfaf0cd45
Change-Id: I0c9952fe8b16ae2e8d4cb80b30d63ba00e172b09
2018-11-28 13:40:48 -08:00
Fraunhofer IIS FDK
9cfaf0cd45
Merge "Add sanity check for allowed LPD sampling rate."
...
am: b8a384b0cd
Change-Id: Iedcbbbee9ffc6b27cbc2f114b110974320f9044b
2018-11-28 13:35:05 -08:00
Treehugger Robot
b8a384b0cd
Merge "Add sanity check for allowed LPD sampling rate."
2018-11-28 21:21:41 +00:00
Fraunhofer IIS FDK
c6b4af4a6c
Add sanity check for allowed LPD sampling rate.
...
Bug: 112662981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
2018-11-28 19:15:09 +00:00
Fraunhofer IIS FDK
455081951d
Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd
am: 36b3869e2c
...
am: 479cc5a6d4
Change-Id: I16208b14efe6ca87828ef031146efc89618b709b
2018-11-27 12:52:11 -08:00
Fraunhofer IIS FDK
479cc5a6d4
Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd
...
am: 36b3869e2c
Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f
2018-11-27 12:47:01 -08:00
Fraunhofer IIS FDK
36b3869e2c
Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."
...
am: 0695cff3dd
Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2
2018-11-27 12:38:58 -08:00
Treehugger Robot
0695cff3dd
Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."
2018-11-27 20:26:33 +00:00
Fraunhofer IIS FDK
108e0da304
Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9
am: c580437d7c
...
am: 3a64e48ede
Change-Id: I72bc148447f38fdd6640dc7854d6905eff229807
2018-11-27 11:22:35 -08:00
Fraunhofer IIS FDK
3a64e48ede
Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9
...
am: c580437d7c
Change-Id: Id8f177954c585644d0535a44560fa3923780a764
2018-11-27 11:13:30 -08:00
Fraunhofer IIS FDK
c580437d7c
Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."
...
am: 0a1e3b6ef9
Change-Id: I2469e802965d3d974ca09a8c911d0d26f09e6700
2018-11-27 11:04:20 -08:00
Treehugger Robot
0a1e3b6ef9
Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."
2018-11-27 18:44:28 +00:00
Fraunhofer IIS FDK
9fe830cef8
Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." am: 652432830a
am: 692cb872b3
...
am: d555cedc95
Change-Id: I897a238cf28c21d36913f656a6f9bf9837d7e2c4
2018-11-27 10:18:11 -08:00
Fraunhofer IIS FDK
d555cedc95
Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." am: 652432830a
...
am: 692cb872b3
Change-Id: I04560b0c7b756b010cd4b929c74b6343adf53fcf
2018-11-27 10:14:02 -08:00
Fraunhofer IIS FDK
692cb872b3
Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()."
...
am: 652432830a
Change-Id: Ic2c58ee86f479f406d519418f52800618a6e80ff
2018-11-27 10:10:05 -08:00
Treehugger Robot
652432830a
Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()."
2018-11-27 17:55:22 +00:00
Fraunhofer IIS FDK
b325367b33
Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader().
...
Bug: 112661893
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d
2018-11-27 12:34:42 -05:00
Fraunhofer IIS FDK
eb0711921b
Unsigned Integer Overflow in aacDecoder_DecodeFrame().
...
Bug: 112661742
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d
2018-11-27 12:30:10 -05:00
Fraunhofer IIS FDK
d4a32ee888
Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07
am: ac56cddd1f
...
am: a16b4cba47
Change-Id: I9739c6a19fffe576aed868880aa7af5912f705eb
2018-11-05 15:19:22 -08:00
Fraunhofer IIS FDK
a16b4cba47
Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07
...
am: ac56cddd1f
Change-Id: I422463f26359bef0ad3220c9324ceb26fcd1da14
2018-11-05 15:14:17 -08:00
Fraunhofer IIS FDK
ac56cddd1f
Merge "Fix huffman decoder escape sequence length limitation."
...
am: a4d6ca7b07
Change-Id: I6cac7c525c4b5c5afca58ac6ab3d2c8925fc343e
2018-11-05 15:09:12 -08:00
Treehugger Robot
a4d6ca7b07
Merge "Fix huffman decoder escape sequence length limitation."
2018-11-05 22:58:33 +00:00
Fraunhofer IIS FDK
1ac4293f0b
Prevent overflow in MPEG-D DRC _setSelectionDataInfo().
...
Bug: 112661687
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9
2018-11-05 15:07:27 -05:00
Fraunhofer IIS FDK
f90be06503
Fix huffman decoder escape sequence length limitation.
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 112661753
Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601
Merged-In: 62623d8d79
2018-11-05 14:43:14 -05:00
Bill Yi
8717d0f65f
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a1c3f92674
-s ours am: add26c57de
-s ours
...
am: 0404fcb27d
-s ours
Change-Id: I4e6e17277d2a64924b66c4d60d823332105f5783
2018-10-24 18:40:17 -07:00
Bill Yi
0404fcb27d
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a1c3f92674
-s ours
...
am: add26c57de
-s ours
Change-Id: Ia28a0fe677a072b2deb93be7d57f29c1ff25b94f
2018-10-24 18:11:34 -07:00
Bill Yi
add26c57de
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: a1c3f92674
-s ours
Change-Id: Ife9cf8d52e066a5575618b2e00eb7ed3c14c65ff
2018-10-24 16:51:52 -07:00
Bill Yi
a1c3f92674
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
2018-10-24 14:45:34 -07:00
Bill Yi
4430a10054
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: b0cb6303be
-s ours
...
am: ef66d21367
-s ours
Change-Id: I8105acd0cae2cfe394790a49b6db7846d525bf6a
2018-10-24 10:31:12 -07:00
Bill Yi
ef66d21367
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: b0cb6303be
-s ours
Change-Id: I08397a31e8c22387ccdd271a2f3c9fb8f8bf22b3
2018-10-24 10:22:10 -07:00
Bill Yi
b0cb6303be
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I040acde299d9f3e7556a2dd9393080aabfa20936
2018-10-24 09:05:20 -07: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 4dad829df0
)
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 f2bc07da2e
)
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 25b209f229
)
2018-10-20 00:16:57 +00:00
Jean-Michel Trivi
4b6bb41eb1
[automerger skipped] Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b
am: 40676e7cba
...
am: 72f73bc52e
-s ours
Change-Id: Ice85276bd0b1869a79f2e190c384a893a88859c7
2018-10-12 12:06:34 -07:00
Jean-Michel Trivi
72f73bc52e
Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b
...
am: 40676e7cba
Change-Id: I07d03570c8173eff319c102ce73c51025afdd056
2018-10-12 12:01:26 -07:00