aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix fixmadddiv2_DD() integer overflow in ↵Fraunhofer IIS FDK2021-05-071-11/+9
|\ | | | | | | | | | | | | | | SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256 Change-Id: Ic04dff8bffc77eb7a178f816b9f67af1381f5a81
| * Fix fixmadddiv2_DD() integer overflow in ↵Fraunhofer IIS FDK2021-05-071-11/+9
| | | | | | | | | | | | | | | | SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I6237be90ed15e107cc4468770da7c330cdeef16f
* | Avoid unintentional sign conversions in lppTransposer() and ↵Fraunhofer IIS FDK2021-05-071-10/+10
|\| | | | | | | | | | | | | | | lppTransposerHBE(). am: 48e0fa028d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124 Change-Id: Ib442c1ba18a5897d34369245eefc84d16c941574
| * Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE().Fraunhofer IIS FDK2021-05-061-10/+10
| | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ifc4618b8de4e377df28e387fb976ab5acb5883d7
* | Merge "Validate whether all PCE listed element instance tags are present in ↵TreeHugger Robot2021-05-061-0/+87
|\| | | | | | | | | | | | | | | raw_data_block." into sc-dev am: 8d746cfdb4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122 Change-Id: Iea02ef7cf0ed422eb6c30fb8ad10577f3c491b67
| * Merge "Validate whether all PCE listed element instance tags are present in ↵TreeHugger Robot2021-05-061-0/+87
| |\ | | | | | | | | | raw_data_block." into sc-dev
| | * Validate whether all PCE listed element instance tags are present in ↵Fraunhofer IIS FDK2021-04-291-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | raw_data_block. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I299d3c11ffa65a7c09c437cd114d62b8d3013e2f
* | | Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵TreeHugger Robot2021-05-062-23/+22
|\| | | | | | | | | | | | | | | | | | | | | | | FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121 Change-Id: I51b0c8c03fe7f1b6e14a802f7340e121d4186fe9
| * | Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵TreeHugger Robot2021-05-062-23/+22
| |\| | | | | | | | | | FDK_get32() to prevent endless loop." into sc-dev
| | * Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵Fraunhofer IIS FDK2021-04-292-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | FDK_get32() to prevent endless loop. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Icaedd341f4602882f72ff5e7be71d99ce08f3bec
* | | Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4TreeHugger Robot2021-05-053-20/+27
|\| | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120 Change-Id: I57870b525ba546597390102d6c53dd847438c2cc
| * | Merge changes I42956a9f,I92f7c559,I5af62590 into sc-devTreeHugger Robot2021-05-053-20/+27
| |\| | | | | | | | | | | | | | | | | | | * changes: Check the number of available escapes in rvlcDecodeBackward() to avoid out-of-bounds access. Sbr syncstate may only be set to upsampling if the sbr decoder was sucessfully initialized. Perform parameter check before parameter assignment to avoid incorrect initialization in resetFreqBandTables().
| | * Check the number of available escapes in rvlcDecodeBackward() to avoid ↵Fraunhofer IIS FDK2021-04-291-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | out-of-bounds access. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I42956a9fd7a8e78c3c0f4f553370ac5a9f1ac2ca
| | * Sbr syncstate may only be set to upsampling if the sbr decoder was ↵Fraunhofer IIS FDK2021-04-291-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | sucessfully initialized. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I92f7c559af961ec063bfea74353f11092dcda653
| | * Perform parameter check before parameter assignment to avoid incorrect ↵Fraunhofer IIS FDK2021-04-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | initialization in resetFreqBandTables(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5af625905b1e4365fa84423d186c227a49707f72
* | | Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157TreeHugger Robot2021-05-051-22/+27
|\| | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117 Change-Id: I1ea355c9e3d4f6cd29111e57da1e0a08a7c7c16c
| * | Merge changes Ic767aeb6,I2aef40ef into sc-devTreeHugger Robot2021-05-051-22/+27
| |\| | | | | | | | | | | | | | | | * changes: Use local variables for sbr and mps state in CAacDecoder_Init() to avoid inconsistencies in case of failing initialization. Follow-up on: Improve decoder robustness by storing flags and elFlags temporarily.
| | * Use local variables for sbr and mps state in CAacDecoder_Init() to avoid ↵Fraunhofer IIS FDK2021-04-291-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | inconsistencies in case of failing initialization. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ic767aeb63cdc7d4556bc68cee0c4f7aeba05d12f
| | * Follow-up on: Improve decoder robustness by storing flags and elFlags ↵Fraunhofer IIS FDK2021-04-291-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | temporarily. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I2aef40ef1868832cd00e4d761b060aa41b1b7efa
* | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: ↵Fraunhofer IIS FDK2021-05-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | b1dc10e5bc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: I34977527f4f0b1585d35df4f3de04282975ac5dc
| * | Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431Fraunhofer IIS FDK2021-05-010-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: Ib689c36358e8b3e5b2f5973c710e4d6d487b8562
| | * | Avoid signed integer overflow in pcmLimiter_Apply().Fraunhofer IIS FDK2021-04-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I89f5206053926cb2f8726e4bc1ffb9fc88371edb (cherry picked from commit 5a83a8e5e1cafceba6bef7ac61e68a57cc93d786)
* | | | Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into ↵TreeHugger Robot2021-05-011-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: ab332a940d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474 Change-Id: I88ee25478125c79da035237e4f1835df9f99020b
| * | | Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-devTreeHugger Robot2021-04-301-6/+9
| |\ \ \
| | * | | Avoid signed integer overflow in combineSignalCplxScale2().Fraunhofer IIS FDK2021-04-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ie35e34d982c99f0e328f8f9251bba32c7da8518c
* | | | | Merge "Improve validation of channel indices in pcmDmx." into sc-dev am: ↵TreeHugger Robot2021-04-301-14/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38afdcc7d0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123 Change-Id: Ia537fcb816c83e19b1343322aea27e40e9e6420a
| * | | | Merge "Improve validation of channel indices in pcmDmx." into sc-devTreeHugger Robot2021-04-301-14/+42
| |\ \ \ \
| | * | | | Improve validation of channel indices in pcmDmx.Fraunhofer IIS FDK2021-04-301-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Bug: 170374298 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: If4d6f5fec266244b496c6ea08cd411badd9a31cf
* | | | | | Merge "Use dynamic scaling depending on autocorr length to avoid signed ↵Jean-Michel Trivi2021-04-301-22/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow." into sc-dev am: a37553e327 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879 Change-Id: Ibcd8380152b106378eb4b7b27eb6da67d327aca1
| * | | | | Merge "Use dynamic scaling depending on autocorr length to avoid signed ↵Jean-Michel Trivi2021-04-301-22/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | integer overflow." into sc-dev
| | * | | | | Use dynamic scaling depending on autocorr length to avoid signed integer ↵Fraunhofer IIS FDK2021-04-291-22/+21
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow. Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibc035ce2eafe4b0d98377d090adad77bbf5cbb5c
* | | | | | Merge "Adjust data types to prevent load of invalid value" into sc-dev am: ↵TreeHugger Robot2021-04-301-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b9f051c92 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853 Change-Id: I6cb305c13a9ffe354a4a0cb89228a473c4688645
| * | | | | Merge "Adjust data types to prevent load of invalid value" into sc-devTreeHugger Robot2021-04-301-5/+5
| |\ \ \ \ \
| | * | | | | Adjust data types to prevent load of invalid valueFraunhofer IIS FDK2021-04-301-5/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust usacExtElementType data type to prevent load of invalid value in extElementConfig(). Adjust usacConfigExtType data type to prevent load of invalid value in configExtension(). Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ide15daa73c084c4a2cfc9d0f36bd7666fa6bac7a
* | | | | | Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into ↵TreeHugger Robot2021-04-301-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: 427912f659 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929 Change-Id: I21fe94ad7e466311385d537fa64cae266ae190eb
| * | | | | Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-devTreeHugger Robot2021-04-301-6/+11
| |\ \ \ \ \
| | * | | | | Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value.Fraunhofer IIS FDK2021-04-301-6/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibf8dbc1e61ff0453ac905efc88892d39c84fece6
* | | | | | Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." ↵TreeHugger Robot2021-04-302-19/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev am: af61f20a8d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930 Change-Id: Ib27b4b3d38bbc153a07ada7f5eaac6bd9a8abc8a
| * | | | | Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." ↵TreeHugger Robot2021-04-302-19/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into sc-dev
| | * | | | | Prevent undefined values for CODING_SCHEME type in huff_decode().Fraunhofer IIS FDK2021-04-302-19/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I82da4a5660289d1c96888d48c315f96a4a5c1c2a
* | | | | | Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in ↵TreeHugger Robot2021-04-301-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475 Change-Id: I781b50c80d1e69068c3138c1d0388cf6809536eb
| * | | | | Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in ↵TreeHugger Robot2021-04-301-14/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot()." into sc-dev
| | * | | | | Revise synthesis QMF scaling for PS to avoid integer overflow in ↵Fraunhofer IIS FDK2021-04-301-14/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot(). Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I23ff345a1b1d0a8d125d49164fbd020387a37901
* | | | | | Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev ↵TreeHugger Robot2021-04-301-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b0a46baf90 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477 Change-Id: Iff2c573663790abf3cd5695ec7a00e89bfd2eaa5
| * | | | | Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-devTreeHugger Robot2021-04-301-14/+14
| |\ \ \ \ \
| | * | | | | Prevent signed integer overflow in calc_qmfBufferReal().Fraunhofer IIS FDK2021-04-301-14/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I6d12fba9d958280ead368fcc4c6c5c79dc0111e2
* | | | | | Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." ↵TreeHugger Robot2021-04-302-194/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev am: dff30034b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482 Change-Id: Idb4db4cce456c61c64fbd0885678414bf7d0ea45
| * | | | | Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." ↵TreeHugger Robot2021-04-302-194/+31
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into sc-dev
| | * | | | Prevent signed integer overflow in complex path of calc_qmfBuffer().Fraunhofer IIS FDK2021-04-302-194/+31
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Iae0581ea983912bcf1bc6b3bdc2c0d8ee2f6248e
* | | | | Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4Fraunhofer IIS FDK2021-04-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: Idd1012d6e024903e71e60e8b29820f484d431792