aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
|\ | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am skip reason: subject contains skip directive Change-Id: Iacff6609b76e136716228b61a989a4a81b051c4f
| * Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"Xin Li2019-06-100-0/+0
| |\
* | \ [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am skip reason: subject contains skip directive Change-Id: I92a43f949f1ca6b2d060c3bd8b5edf097b7db637
| * | DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into masterThe Android Open Source Project2019-06-100-0/+0
| |\ \ | |/ / |/| / | |/ | | Bug: 134605042 Change-Id: Ife6e13bfe9017388e48143e2f6475111d5bebca3
* | DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into ↵Xin Li2019-06-050-0/+0
|\ \ | |/ |/| | | | | | | | | stage-aosp-master Bug: 134605042 Change-Id: I5741210a2732e88685d878a5eb96d381924fa8d3
| * 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)
* | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I1bbe11b78b2f06f948be0e04fcae6582bad9cc21
| * \ \ Merge "Do not support channel configuration change within PCE" am: ed56e77acbJean-Michel Trivi2019-01-151-7/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: a82589476a Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32
| * \ \ \ Merge "Add AOT specific number of qmf bands sanity check in ↵Fraunhofer IIS FDK2019-01-039-50/+144
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialSpecificConfig()" am: bcda185d56 am: 4ab4454f29 Change-Id: I0ac3055487ce17f6218e3a0644778a0d8da27119
| * \ \ \ \ Merge "Integer overflow fix in _compressorIO_sigmoid()" am: 7c908b13b9Fraunhofer IIS FDK2019-01-031-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 195d913e65 Change-Id: I7482706e761f2faeeb0fa42ec7f58427409d3519
| * \ \ \ \ \ Merge "Return transport decoder error in case of invalid ELD configuration" ↵Jean-Michel Trivi2019-01-021-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7884aefc84 am: 81b04be9ba Change-Id: Iab2c9ead062dd99dc441f7765bf02fb72736e37f
| * \ \ \ \ \ \ Merge "Add sanity check in huff_decode()" am: 3942213f19Jean-Michel Trivi2019-01-021-0/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8d06f35f31 Change-Id: I387be28f72d64ea61a1628d296d9abcdf361e54b
| * \ \ \ \ \ \ \ Merge changes I7add6dff,I0249f758 am: b42dfa745bFraunhofer IIS FDK2019-01-021-6/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8bdeed59aa Change-Id: I335f3e5f617add8bdbfc6e5c0bb6a0eab80f4f9a
| * \ \ \ \ \ \ \ \ Merge "Clear spatial specific config struct at the beginning of parse ↵Fraunhofer IIS FDK2018-12-291-0/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routines" am: 0142f38904 am: 0ef6247c4f Change-Id: I4e11c35bb3e4c20f2844bcec8912f15139fa185f
| * \ \ \ \ \ \ \ \ \ Merge "Free whole QMF domain in case of an error in ↵Fraunhofer IIS FDK2018-12-291-3/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDK_QmfDomain_Configure()" am: f8881d4bfe am: 005d5690b6 Change-Id: I4c63548e0a96ffed45f64d0a14c1764acac25d2c
| * \ \ \ \ \ \ \ \ \ \ Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over ↵Fraunhofer IIS FDK2018-12-292-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMF_FLAG_CLDFB" am: cf4098ed3b am: 57939192c3 Change-Id: I799ffa0efb296051c963645e5070dfae67ef9b03
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Add missing parameter initialization in FDK_QmfDomain_Clear*() ↵Fraunhofer IIS FDK2018-12-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions" am: 6953f2c5b2 am: bb32492644 Change-Id: Ib2e3683a85ffe204a0ed5c0b73e5ccc2b7005b0c
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2Fraunhofer IIS FDK2018-12-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 196f1ce484 Change-Id: I4bcc2e7ff145bffb7f11a090e8a048e9c2d11d76
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add valid bits check to adts header parser" am: b622299482Jean-Michel Trivi2018-12-281-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ffb999bec4 Change-Id: I9769e9e7152cc5294f3b1a925487938803f40878
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Skip CRC check when flushing or concealment is applied" am: 385764944dJean-Michel Trivi2018-12-281-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7c9f1165e7 Change-Id: Ia818ae31a012d18cefad45ea969123d09ff6e31a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7bJean-Michel Trivi2018-12-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e9e770ba71 Change-Id: Iff794b79659de4e4ce552b4ecb5c171b3f959faa
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Setup lowdelay SBR LFE element via SBR callback" am: 3e0a7a40c5Jean-Michel Trivi2018-12-281-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7e454bd098 Change-Id: Ida1f2655913afe2f16b3efd9464b2c7027732d17
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Extend PS concealment/error treatment" am: 58221178ccJean-Michel Trivi2018-12-282-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 45903f4e5a Change-Id: I907fa44b6ab124f4b31a04212d06ff3e22cac567
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix potential invalid memory access for concealment in ↵Jean-Michel Trivi2018-12-281-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decodeEnvelope()" am: 6acfe3b799 am: 3d9793633e Change-Id: Iba356069f8d51e6a2afd199f62b84867dd34902e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Reset all noisefloor levels in leanSbrConcealment()" am: c19c36cbfcJean-Michel Trivi2018-12-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a129f9b266 Change-Id: I8362c86b61b9bcc69edb8015de14a287b9932f8f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7Jean-Michel Trivi2018-12-2716-20/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f5512132f3 Change-Id: Ie01b6d6c881c4c9a52af921eee9f7ced6fd6880e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16aJean-Michel Trivi2018-12-271-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2027969e1f Change-Id: I1c13d0a0fbbeb5c937e3e1391f0974e5caf76a20
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: ↵Jean-Michel Trivi2018-12-271-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfc6616048 am: 8b3ca08a7d Change-Id: I42d3b717bb324e560d5ae15265fa9f36d8eb0682
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Signed Integer Overflows in imlt_block()" am: 55930c28afJean-Michel Trivi2018-12-271-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7d959f2f30 Change-Id: Iea1e4a89029523511bef926c98ee23e9bcb216fe
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17Jean-Michel Trivi2018-12-261-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ca0d8e7461 Change-Id: Ia4e0396a4df14d667f80aded10631815b715e2c2
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84Jean-Michel Trivi2018-12-261-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a98beef0cf Change-Id: Ie8198a53d1666d97ae586c9984b8ffcdb6c528c7
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflow in ↵Jean-Michel Trivi2018-12-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931 am: 466adf2a1b Change-Id: I354fe7ee0401e1e154ae42ce9a80672db8a84d08
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Improve error robustness in arithmetic decoder" am: ecdec651daJean-Michel Trivi2018-12-261-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 485d02df73 Change-Id: Ied4097f663ac0aeee589fe9a1ee3bb7cf8245219
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Prevent overflow in usac filters" am: 4053380094Jean-Michel Trivi2018-12-263-10/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eaad782db3 Change-Id: I86ee269643f3247138c71ffe88a2a589bfce0357
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6Jean-Michel Trivi2018-12-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8879fb1fd6 Change-Id: I955c6e7d250ac52986aeb0879dad976dd62d3fab
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50Jean-Michel Trivi2018-12-264-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b471c2c215 Change-Id: Ib6f14a5f7b33ffb8bce1a9b37531c0872eeceb2e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain ↵Jean-Michel Trivi2018-12-261-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cases" am: 27894057af am: 86d12efb92 Change-Id: I61e1f526eccf8c6cdf428058ba7b1da4ae2f9a80
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "UBSAN overflow in FFT" am: f59fd73d44Jean-Michel Trivi2018-12-262-623/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 24f0dd93fe Change-Id: I378df5b2f7389849a368d995867620b4c51ff07c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflow in transportDec_readHeader()." am: 93e981d1e1Jean-Michel Trivi2018-12-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 11e6511470 Change-Id: I2e93dbf3792b0039d36d882e66007cf251fc15ff
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()." ↵Jean-Michel Trivi2018-12-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f3b4de053 am: 0102aec77e Change-Id: I6c33cc8803833da107e6ee70b503efd10ba1909e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()." am: ↵Jean-Michel Trivi2018-12-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8b5674a5f am: d200c4e938 Change-Id: I8cb790054357f6c9d81e5b327fabb421d9479ebb
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2018-12-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.181205.001) into master" am: c75797cfaa -s ours am: fc69d85bd4 -s ours Change-Id: I139fbb395793d9af0a32dcbf6e07f697f0c7a8b5
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2018-12-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.181205.001) into master am: 20c336953f -s ours am: 1fdfa469a6 -s ours Change-Id: I4224085df6dd07c11fcc0caa42ae1e2e40d8a05e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Enable bounds sanitization in libaac." am: cdaf85d874Ivan Lozano2018-12-121-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c03a49ab12 Change-Id: If2c1b228bb95708f59ef485c6ccc0275d4681a00
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2018-12-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.181205.001) into stage-aosp-master am: b857efbb10 -s ours Change-Id: Id5e78fc0d96a4532c5f7d11721bad1b243767915
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2Fraunhofer IIS FDK2018-11-291-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6e4fe2e06b Change-Id: Ie017463a9aad54c9b02672c0aa4d1e7f06847427
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cdFraunhofer IIS FDK2018-11-281-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9cfaf0cd45 Change-Id: I0c9952fe8b16ae2e8d4cb80b30d63ba00e172b09
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." ↵Fraunhofer IIS FDK2018-11-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0695cff3dd am: 36b3869e2c Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f