aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li2018-12-1116-213/+175
|\ | | | | | | | | Bug: 120502534 Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
| * 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)
| | | * Add sampling rate sanity checkFraunhofer IIS FDK2018-09-101-1/+3
| | |/ | | | | | | | | | | | | | | | | | | Bug: 112661641 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221 (cherry picked from commit ba003785774efe355bcac950158fc78a0cff0c2b)
* | | Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"Treehugger Robot2018-11-291-3/+5
|\ \ \
| * | | Integer overflow fix in InvMdctTransformLowDelay_fdk()Fraunhofer IIS FDK2018-11-281-3/+5
|/ / / | | | | | | | | | | | | | | | | | | Bug: 112892194 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I47fdb5b51afd8c588607bf206d4ae3ef4ba1cdb3
* | | Merge "Add sanity check for allowed LPD sampling rate."Treehugger Robot2018-11-281-2/+1
|\ \ \
| * | | Add sanity check for allowed LPD sampling rate.Fraunhofer IIS FDK2018-11-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112662981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896 Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
* | | | Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."Treehugger Robot2018-11-271-2/+2
|\ \ \ \
| * | | | Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader().Fraunhofer IIS FDK2018-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112661893 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d
* | | | | Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."Treehugger Robot2018-11-271-1/+1
|\ \ \ \ \
| * | | | | Unsigned Integer Overflow in aacDecoder_DecodeFrame().Fraunhofer IIS FDK2018-11-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112661742 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d
* | | | | Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()."Treehugger Robot2018-11-271-9/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent overflow in MPEG-D DRC _setSelectionDataInfo().Fraunhofer IIS FDK2018-11-051-9/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112661687 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9
* | | | Merge "Fix huffman decoder escape sequence length limitation."Treehugger Robot2018-11-051-5/+7
|\ \ \ \
| * | | | Fix huffman decoder escape sequence length limitation.Fraunhofer IIS FDK2018-11-051-5/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 112661753 Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601 Merged-In: 62623d8d797a3d7314834c59ebc785e738965635
* | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
| * | | Snap for 4807121 from f19e863cce96cc1e5f4ad7ce512810d5a2843ea6 to pi-releaseandroid-build-team Robot2018-05-272-10/+12
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I8797944fb72a1182a059e75425a8b54b4e8abf51
| * | | Snap for 4801384 from a4d1f0ad52e2cf6f168d2193216602f52033fc27 to pi-releaseandroid-build-team Robot2018-05-2416-126/+150
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Iab0959417db83cdeb3af7ce59ef4d8584a96b8be
| * \ \ \ Snap for 4773106 from 44ac411683e7cfbfdb1f58e02d54377d709c8dd4 to pi-releaseandroid-build-team Robot2018-05-108-26/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I5a98f52a42445a8a9cbd9e582612a57d1e277f5d
| * \ \ \ \ Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-releaseandroid-build-team Robot2018-05-0610-31/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
| * \ \ \ \ \ Snap for 4754571 from 6cfabd35363c3ef5e3b209b867169a500b3ccc3c to pi-releaseandroid-build-team Robot2018-05-01450-84882/+165724
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I130760e1e9a6c00340ae89ffd327f340c236716e
| * \ \ \ \ \ \ Snap for 4585119 from 6288a1e34c4dede4c2806beb1736ece6580558c7 to pi-releaseandroid-build-team Robot2018-02-050-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4fc531cb7dc898e8ebe483c5f201bd8f3c86788
| * \ \ \ \ \ \ \ Snap for 4579913 from 5c37b577ee5af800f8d4cc0cff08549f156fcbff to pi-releaseandroid-build-team Robot2018-02-010-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddd2f4c623cd958a2e239c22f23196e2407691ac
| * \ \ \ \ \ \ \ \ Snap for 4545621 from 82e17d87f061014b3c07140fafe78eaaf2fbe39d to pi-releaseandroid-build-team Robot2018-01-141-4/+19
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2910df2b1395c73d6a693199ae38aea499630a7
| * \ \ \ \ \ \ \ \ \ Snap for 4496165 from 204565877157d578ae6632dd54065a4e9cfcab94 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93144804d393601719fcc7b3e2c3fc647942a89f
| * \ \ \ \ \ \ \ \ \ \ Snap for 4434599 from bb75c081ed53b4f01ef202da3799a92705acfde0 to pi-releaseandroid-build-team Robot2017-11-051-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie027781ff119fe215f492bacc830febaf156d523
| * \ \ \ \ \ \ \ \ \ \ \ Snap for 4383207 from 15759ceb7bd56575776cd4f789c1c2597d265f5b to pi-releaseandroid-build-team Robot2017-10-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c9541a967456c23dd621965cd7e8b9edd39ff85
| * \ \ \ \ \ \ \ \ \ \ \ \ release-request-0b474cbb-ff20-424d-a570-a0a7b83a7705-for-git_pi-release-4262 ↵android-build-team Robot2017-08-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 110 snap-temp-L42700000091449286 Change-Id: I7156dd934b8ce12dc00e2ef192617a0025264117
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Jean-Michel Trivi2018-10-121-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type." am: fb65c0c24b Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Jean-Michel Trivi2018-10-121-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type."
| | * | | | | | | | | | | | | | Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Fraunhofer IIS FDK2018-10-121-1/+18
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type. While testing FDK in Android P DP3 x86 64bit emulator we observed a runtime error. The function parameter of the callback didn't use a typeless pointer. Following patch contains a revised sbr decoder callback function with explicit data type cast to be inline with all other callbacks in FDK. Bug: 112662306 Bug: 116075869 Test: on x86: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
* | | | | | | | | | | | | | | Merge "Signed Integer Overflow in DuckerCalcEnergy()"Jean-Michel Trivi2018-10-041-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 78f80da872 Change-Id: If4010115866eeb52033fa361aafdb6665c824471
| * | | | | | | | | | | | | | Merge "Signed Integer Overflow in DuckerCalcEnergy()"Jean-Michel Trivi2018-10-041-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Signed Integer Overflow in DuckerCalcEnergy()Fraunhofer IIS FDK2018-10-041-8/+10
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112122038 Bug: 112891546 Test: see b/112122038 for repro stream Change-Id: I7542e2a9033c2e97bf32e0be3bbc6f48746d28f0
* | | | | | | | | | | | | | | Merge "Suppress -Wimplicit-fallthrough."Chih-hung Hsieh2018-09-051-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8704782ffd Change-Id: I4712438bc10c81df6fef4d3a8ea6efeae483a6fe
| * | | | | | | | | | | | | | Merge "Suppress -Wimplicit-fallthrough."Chih-hung Hsieh2018-09-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Suppress -Wimplicit-fallthrough.Chih-Hung Hsieh2018-09-041-0/+1
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wimplicit-fallthrough will be enabled globally. Test: build with global -Wimplicit-fallthrough. Change-Id: I13b4402d9df23a888bdc80be4ce39cd5cd4cff7f
* | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 7027cd8748Xin Li2018-08-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6acb615429 Change-Id: I1e133a180eccad7a726a4f37ebbf378a5f15c7a4
| * | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7027cd8748 Change-Id: I8af7f0e7c9e5527c66d4f2d75a3e70f620a5ccee
| | * | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-07450-84893/+165806
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-06450-84893/+165806
| | |/| | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112104996 Change-Id: I110b508de124016501bc62120163c58633857438
* | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6a79fb47e4 Change-Id: Ib9c8ca0370bee684b8b6ae903325ea8f1f1b34d3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 02:07:49 +0000