aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: ↵Fraunhofer IIS FDK2021-05-071-23/+54
|\ | | | | | | | | | | | | | | 56de8e29ce am: cd41dbd325 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258 Change-Id: I10970daf44e125418edaab85a7f238c0251672a7
| * Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: ↵Fraunhofer IIS FDK2021-05-071-23/+54
| |\ | | | | | | | | | | | | | | | | | | | | | 56de8e29ce Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258 Change-Id: I333d98de722a0fb4b94007a77236e503b8b7b3ca
| | * Utilize dynamic scaling in slotAmp() to avoid signed integer overflows.Fraunhofer IIS FDK2021-05-071-23/+54
| | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ia66fbbd16dec4f9e04d67463cca91d75f3741131
* | | Adapt scaling in combineSignalCplxScale*() to prevent signed integer ↵Fraunhofer IIS FDK2021-05-071-15/+10
|\| | | | | | | | | | | | | | | | | | | | | | | overflows. am: 773ff1d3e8 am: 1b074faaa8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257 Change-Id: I304d50b4f3c7a5e2451ddf0a5407ade7fef70c07
| * | Adapt scaling in combineSignalCplxScale*() to prevent signed integer ↵Fraunhofer IIS FDK2021-05-071-15/+10
| |\| | | | | | | | | | | | | | | | | | | | | | overflows. am: 773ff1d3e8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257 Change-Id: Ic6d8ab1c4899aa7670074dd6011a2df85852d943
| | * Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows.Fraunhofer IIS FDK2021-05-071-15/+10
| | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: If773c90ccd256fd03641446c7f8bd82d04a100e4
* | | Fix fixmadddiv2_DD() integer overflow in ↵Fraunhofer IIS FDK2021-05-071-11/+9
|\| | | | | | | | | | | | | | | | | | | | | | | SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf am: babb5dce2f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256 Change-Id: I86d6e5de19075554a043550fd79e6c95f82a1aa6
| * | 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: I6caaf0c53349cf38da263edcbccfdd49cbea624f
| | * 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 am: ff4ace52fa Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124 Change-Id: I43642d53262d80203945bd0523709de6c9150c65
| * | 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: I4c7d4503727d5908e909dcc7999ce39517be7e08
| | * 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 am: c39393a732 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122 Change-Id: Idc00ca1f0864ada1c355b1016dbd12d9453270cd
| * | 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: I4caa1c83fc5986f4d3a9c23ee8ca448a1d8131b7
| | * 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 am: ad6ba7f548 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121 Change-Id: I5a359e83c96fce7323ff0e108102798b9571f28e
| * | | 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: Ica864c2a1ea78200a44882b593fe5b5bbb014f5f
| | * | 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: 826719dee4 am: ↵TreeHugger Robot2021-05-053-20/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47ee0b94ab Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120 Change-Id: If591824a987260de27b479e8844906bbcd710031
| * | | 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: Ib7da85b08a91c3182240487b0b4ded667f0d7f4a
| | * | 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: 2a3cde8157 am: cffde9083dTreeHugger Robot2021-05-051-22/+27
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117 Change-Id: I68997798fa469bcec9a146560d0ac57357b4b69e
| * | | 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: If632a10eb3a9c8f738769ca7cf539c1a4d81e3ed
| | * | 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 am: f708b26538 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: Ia46125b36c23e96e0b40595b617947f283cba1aa
| * | | 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: I5807efd132d61353cf9211ad94eb0caf0720f7b4
| | * | 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 am: 4c350fc3fc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474 Change-Id: I65ab34b1b25c999fded1364e430a914753e377c5
| * | | | 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: I12fcc01fba0918d33c9d802a614c97b7a3c33d6e
| | * | | 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-05-011-14/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38afdcc7d0 am: 46a636829c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123 Change-Id: Ic1169b5be36ce52bd1336b8b91e385c642a603a5
| * | | | | 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: I8fa1e312041703cf3a7ba316e6c0bb65c0b52176
| | * | | | 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 am: 2841b0ff99 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879 Change-Id: Iadf6fbaf267c2650eae872de60064f1f98cc7afc
| * | | | | | 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: I4a47ed883fba05b56f2cde2d6005ba2a413392d5
| | * | | | | 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 am: 8ed5575e34 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853 Change-Id: If5a0a8f46d213f30b867d5e705852d62b1161fa1
| * | | | | | 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: I0bf2e8c3d568ab250b9a2d774445c99565bdcc7c
| | * | | | | Merge "Adjust data types to prevent load of invalid value" into sc-devTreeHugger Robot2021-04-301-5/+5
| | |\ \ \ \ \