aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | 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()" am: d2be744af2Fraunhofer IIS FDK2018-11-291-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6e4fe2e06b Change-Id: Ie017463a9aad54c9b02672c0aa4d1e7f06847427
| * | | | | Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"Fraunhofer IIS FDK2018-11-291-3/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | am: d2be744af2 Change-Id: I780b6c3791bd9bc70fa11a6990cb95a2e5d5ae7c
| | * | | | 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." am: b8a384b0cdFraunhofer IIS FDK2018-11-281-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9cfaf0cd45 Change-Id: I0c9952fe8b16ae2e8d4cb80b30d63ba00e172b09
| * | | | | Merge "Add sanity check for allowed LPD sampling rate."Fraunhofer IIS FDK2018-11-281-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b8a384b0cd Change-Id: Iedcbbbee9ffc6b27cbc2f114b110974320f9044b
| | * | | | 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()." ↵Fraunhofer IIS FDK2018-11-271-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0695cff3dd am: 36b3869e2c Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f
| * | | | | Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."Fraunhofer IIS FDK2018-11-271-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0695cff3dd Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2
| | * | | | 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()." am: 0a1e3b6ef9Fraunhofer IIS FDK2018-11-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c580437d7c Change-Id: Id8f177954c585644d0535a44560fa3923780a764
| * | | | | | Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."Fraunhofer IIS FDK2018-11-271-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a1e3b6ef9 Change-Id: I2469e802965d3d974ca09a8c911d0d26f09e6700
| | * | | | | 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()." am: 652432830aFraunhofer IIS FDK2018-11-271-9/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 692cb872b3 Change-Id: I04560b0c7b756b010cd4b929c74b6343adf53fcf
| * | | | | | Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()."Fraunhofer IIS FDK2018-11-271-9/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 652432830a Change-Id: Ic2c58ee86f479f406d519418f52800618a6e80ff
| | * | | | | 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." am: a4d6ca7b07Fraunhofer IIS FDK2018-11-051-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ac56cddd1f Change-Id: I422463f26359bef0ad3220c9324ceb26fcd1da14
| * | | | | Merge "Fix huffman decoder escape sequence length limitation."Fraunhofer IIS FDK2018-11-051-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a4d6ca7b07 Change-Id: I6cac7c525c4b5c5afca58ac6ab3d2c8925fc343e
| | * | | | 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
* | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: a1c3f92674 -s ours am: add26c57de -s ours Change-Id: Ia28a0fe677a072b2deb93be7d57f29c1ff25b94f
| * | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a1c3f92674 -s ours Change-Id: Ife9cf8d52e066a5575618b2e00eb7ed3c14c65ff
| | * | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: b0cb6303be -s ours Change-Id: I08397a31e8c22387ccdd271a2f3c9fb8f8bf22b3
| * | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / Change-Id: I040acde299d9f3e7556a2dd9393080aabfa20936
| | * | | 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 am: 40676e7cba Change-Id: I07d03570c8173eff319c102ce73c51025afdd056
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | [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 am: 69514bb308 -s ours Change-Id: I1654e50401da46c5cbd3dc0fe35bfa2a0a20f547