aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clear config in case of parsing error in drcDec_readUniDrc()Fraunhofer IIS FDK2019-03-141-2/+10
| | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ic1a12cbd31aa51d8a89bc4d6a67f9b0289265b6c
* Merge "AAC decoder: fix use of uninitialized value, check index"Jean-Michel Trivi2019-03-081-1/+2
|\
| * AAC decoder: fix use of uninitialized value, check indexJean-Michel Trivi2019-03-071-1/+2
| | | | | | | | | | | | | | | | | | Initialize aInterpolate int array in mapIndexData(). Prevent index from accessing OOB value. Bug: 120426980 Test: see bug Change-Id: Ib9f1b5e143802d3d662af36fedcae8bf47ff09bc
* | Merge "libSBRdec: prevent OOB access"TreeHugger Robot2019-03-081-0/+4
|\ \
| * | libSBRdec: prevent OOB accessJean-Michel Trivi2019-03-071-0/+4
| |/ | | | | | | | | | | | | | | | | In generateFixFixOnly() check validity of index before accessing SBR decoder envolope tables. Bug: 112052062 Test: see bug Change-Id: Icd7ec3807eea9ef8417dba7383f361101becc4f2
* / libMpegTPDec: fix use of uninitialized value in OutOfBandConfigJean-Michel Trivi2019-03-071-1/+1
|/ | | | | | | | Initialize tmpConf in transportDec_OutOfBandConfig Bug: 120426166 Test: see bug Change-Id: I72ac8bc96a7d386ffe32acd669c78c4a581d52dc
* Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: 719ad2e600 Change-Id: I2eda96b8a597569263b841f21b66b55b5e9a4971
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: If648fc23ea1edee18f0bf264b7b35aac504a25b5
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I1bbe11b78b2f06f948be0e04fcae6582bad9cc21
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours am: 2ef1b029ce -s ours am skip reason: subject contains skip directive Change-Id: I9f869083551264692a4efe9d94a8085ba2ace4d0
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours am skip reason: subject contains skip directive Change-Id: I33bcb484a7e06e1f38cbd7dc9e25faccdc7feede
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d5724aefe9 -s ours am skip reason: subject contains skip directive Change-Id: I2b7fecb7f6abba1645b3a201c9ae9bf57b22882e
| | | * \ Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-201-4/+4
| | | |\ \
* | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ac13ae4aa -s ours am: b3537f907a -s ours am: 9d138bd1e3 -s ours am skip reason: subject contains skip directive Change-Id: I241eff03f8e88fb2cef002ade4f415d42759b1fd
| * | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ac13ae4aa -s ours am: b3537f907a -s ours am skip reason: subject contains skip directive Change-Id: Icc01260ec9ce2a2c3b5122327293ca2dc69976ce
| | * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 7ac13ae4aa -s ours am skip reason: subject contains skip directive Change-Id: Iadf52d35e2cf2a963d0a9b78cbcf7a8320d3b27d
| | | * | | DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-181-4/+4
| | | |\ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | Bug: 124234733 Change-Id: Ib53d396a2651013248e3f1a9f0bc68556f747274
* | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 8e6b62378b -s ours am: 1e76f33d25 -s ours am skip reason: subject contains skip directive Change-Id: I20b3c6186d964c2111c32e98032f988563459517
| * | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 8e6b62378b -s ours am skip reason: subject contains skip directive Change-Id: I0bc5b47403e54076c6d7096ec3108000188660dd
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-121-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b
| | | * \ \ 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
| | | | * \ \ \ Snap for 5058880 from 927448349c11391dae98fe1581813ae7ea1520ad to ↵android-build-team Robot2018-10-102-27/+50
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I29a06049a91662e96b50e7776d55bcc79123ad19
| | | | * \ \ \ \ Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to ↵android-build-team Robot2018-10-022-22/+11
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
* | | | | | | | | | Merge "Add QMF analysis band sanity check" am: b30e02cfd3 am: db4a1deb28Jean-Michel Trivi2019-02-012-3/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6ff2d3cf8e Change-Id: I12bc58a0ed01daba0295a4a8feab853b6cc3f0f0
| * | | | | | | | | Merge "Add QMF analysis band sanity check" am: b30e02cfd3Jean-Michel Trivi2019-02-012-3/+11
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: db4a1deb28 Change-Id: I0b4b5de02becd0a105e9958231ef2e58000d2cc8
| | * | | | | | | Merge "Add QMF analysis band sanity check"Jean-Michel Trivi2019-02-012-3/+11
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b30e02cfd3 Change-Id: I6f21f18ac59f27eecdddb37d81bdfacf34cbae38
| | | * | | | | | Merge "Add QMF analysis band sanity check"Jean-Michel Trivi2019-02-012-3/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | Add QMF analysis band sanity checkFraunhofer IIS FDK2019-01-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
* | | | | | | | | | Don't explicitly enable CFI in libFraunhoferAACHarish Mahendrakar2019-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since libFraunhoferAAC is a static library, both CFI and non-CFI variants will be built and linked accordingly. If it is used as a shared library in the future, we'll need to explicitly re-enable CFI in the build file. Bug: 117994055 Change-Id: I825c53b5f895e00c1fb9357c573b6b5c2261c743
* | | | | | | | | | Merge "Do not support channel configuration change within PCE" am: ↵Jean-Michel Trivi2019-01-151-7/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed56e77acb am: a82589476a am: 7ca245e21e Change-Id: Ic339d07a62ddbecdc6c2efcd5834e5758c90f70f
| * | | | | | | | | Merge "Do not support channel configuration change within PCE" am: ed56e77acbJean-Michel Trivi2019-01-151-7/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a82589476a Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32
| | * | | | | | | | Merge "Do not support channel configuration change within PCE"Jean-Michel Trivi2019-01-151-7/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ed56e77acb Change-Id: I46123b5bebaf9418a6033a1a88d5d2542f6ade6d
| | | * | | | | | | Merge "Do not support channel configuration change within PCE"Jean-Michel Trivi2019-01-151-7/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Do not support channel configuration change within PCEFraunhofer IIS FDK2019-01-021-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I94bddad6c88148dd01fff0850e261d98ef691793
* | | | | | | | | | Merge "Add AOT specific number of qmf bands sanity check in ↵Fraunhofer IIS FDK2019-01-039-50/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialSpecificConfig()" am: bcda185d56 am: 4ab4454f29 am: 6d1247f2e2 Change-Id: I1552fb42268ad2b019b728a8d61561a9028a60ad
| * | | | | | | | | 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 "Add AOT specific number of qmf bands sanity check in ↵Fraunhofer IIS FDK2019-01-039-50/+144
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialSpecificConfig()" am: bcda185d56 Change-Id: I0717e1ac3818b2516b3a57b929e2d84f4384dbce
| | | * | | | | | | Merge "Add AOT specific number of qmf bands sanity check in ↵Treehugger Robot2019-01-049-50/+144
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialSpecificConfig()"
| | | | * | | | | | | Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()Fraunhofer IIS FDK2019-01-039-50/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ic106c4371c5ac17cb832c7d9db042bcc9d1e7a09
* | | | | | | | | | | Merge "Integer overflow fix in _compressorIO_sigmoid()" am: 7c908b13b9 am: ↵Fraunhofer IIS FDK2019-01-031-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 195d913e65 am: 1ce3f9e135 Change-Id: I91b0c2eb123c2fce1039f942b1bc4e0137d2980e
| * | | | | | | | | | Merge "Integer overflow fix in _compressorIO_sigmoid()" am: 7c908b13b9Fraunhofer IIS FDK2019-01-031-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 195d913e65 Change-Id: I7482706e761f2faeeb0fa42ec7f58427409d3519
| | * | | | | | | | | Merge "Integer overflow fix in _compressorIO_sigmoid()"Fraunhofer IIS FDK2019-01-031-2/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7c908b13b9 Change-Id: I8265838085c3db1931a4ccb614ec7e4cdcca63e5
| | | * | | | | | | | Merge "Integer overflow fix in _compressorIO_sigmoid()"Treehugger Robot2019-01-041-2/+3
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Integer overflow fix in _compressorIO_sigmoid()Fraunhofer IIS FDK2019-01-031-2/+3
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I3b7c72a85fc735469cc785ca5aa0545485b91532
* | | | | | | | | | Merge "Return transport decoder error in case of invalid ELD configuration" ↵Jean-Michel Trivi2019-01-021-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7884aefc84 am: 81b04be9ba am: 9cc8070883 Change-Id: Ic870a0c4b7f796da18eb8ed2da533214d1e200eb
| * | | | | | | | | 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 "Return transport decoder error in case of invalid ELD configuration"Jean-Michel Trivi2019-01-021-0/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7884aefc84 Change-Id: Iff226ac091d4dffb5d94033c0afcfb0af4c5bfd2
| | | * | | | | | | Merge "Return transport decoder error in case of invalid ELD configuration"Jean-Michel Trivi2019-01-021-0/+8
| | | |\| | | | | |
| | | | * | | | | | Return transport decoder error in case of invalid ELD configurationFraunhofer IIS FDK2019-01-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I65c98830d361a82c9d173eadb44ff245cd076fdf