aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: d2aca9e020 am: ↵Fraunhofer IIS FDK2021-05-170-0/+0
|\ | | | | | | | | | | | | | | 6edbc9a7e8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: I0c2ab0e97698ba9c45313e2515a20874b7ceef74
| * Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: d2aca9e020Fraunhofer IIS FDK2021-04-301-2/+2
| |\ | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: Ie51264d592a1a2b6afbdf347b05ac5260e9ef1d0
| | * 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: Ied81b3004086b8bb5e58bb94e7600293e21ee553
* | | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: ↵Fraunhofer IIS FDK2021-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7aee93697 am: 7997eb4a73 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: I7210851beb677d0fe260cdfb3a3a1dff98955f43
| * | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: ↵Fraunhofer IIS FDK2021-04-301-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7aee93697 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: I8fa97fd0acad276f8e6c26f153027f4ace636f5a
| | * | Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1Fraunhofer IIS FDK2021-04-301-2/+3
| |/| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: I88a7881171286fdaa438a3c2aad49f3f9822b1e4
* | | | Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description." into sc-dev am: d2c2a20682 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063 Change-Id: Ife83d0980ab3a8a29db757dbe6aa7c39f0547633
| * \ \ \ Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | description." into sc-dev
| | * | | | Refine aacDecoder_DecodeFrame() output buffer parameter type description.Fraunhofer IIS FDK2021-05-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I83a460d03c7cde3e4f74011a7c3556c4cfd08cdd
* | | | | | Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value ↵TreeHugger Robot2021-05-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902 Change-Id: If1e1fa8ba514f72fff2e14968f59e62ed2d07b3d
| * | | | | Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value ↵TreeHugger Robot2021-05-081-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | in _skipEqCoefficients()." into sc-dev
| | * | | | Adjust eqSubbandGainFormat data type to prevent load of invalid value in ↵Fraunhofer IIS FDK2021-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _skipEqCoefficients(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibd70f0c3e591d5581e5fe2a7469181bc0ba95a3c
* | | | | | Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93Fraunhofer IIS FDK2021-05-073-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062 Change-Id: If1dc7f802006ccf79587cd372e7b673b0f155dde
| * | | | | Add parameter pointer check to aacEncInfo() encoder API function.Fraunhofer IIS FDK2021-05-073-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf
* | | | | | Prevent too large shift exponent in apply_inter_tes() and merge two loops. ↵Fraunhofer IIS FDK2021-05-071-22/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a40fde39d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061 Change-Id: If4e702f228c4053c345a9141636b198d470b6070
| * | | | | Prevent too large shift exponent in apply_inter_tes() and merge two loops.Fraunhofer IIS FDK2021-05-071-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I9ecb7fbae0a2c2c24af9067846afcf499b021608
* | | | | | Use scaleValuesSaturate() to avoid integer overflows in ↵Fraunhofer IIS FDK2021-05-071-33/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmfTransposerApply(). am: e5a14d0a33 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060 Change-Id: I5032ed2fc0536df8e16e5488128c8b9b94a70650
| * | | | | Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply().Fraunhofer IIS FDK2021-05-071-33/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ib83bd37861e1e24ff18ea276244a370962808fcf
* | | | | | Pass flushing flag to SBR module for stereo config index 3 as for stereo ↵Fraunhofer IIS FDK2021-05-071-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config index 1 and 2. am: 92dd536642 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259 Change-Id: Ic01ed1a89ebe6445b2cf107415a2d72bafe22863
| * | | | | Pass flushing flag to SBR module for stereo config index 3 as for stereo ↵Fraunhofer IIS FDK2021-05-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config index 1 and 2. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ifed0885abdbbfb2e2d4d94bc482e5e1e30794049
* | | | | | 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: I9959ecb8bb6f1283a701011af6f398dfaf2aa906
| * | | | | 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 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257 Change-Id: If6c6a562abc17624b1a0534d6dcc9a12c74af522
| * | | | | 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 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256 Change-Id: I650d87421f7b65025d308e0e148fe064796f2aac
| * | | | | 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: I7ceb9658a16449db89ccda5de743b1c834f0ec10
| * | | | 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: I75352e8ef2334785b18ace1c2d3b635ee700f02e
| * | | | 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: I2734f66d95df9031c855bef4b4dc49a7086ba811
| * | | | | 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: I747f1d34cb96ee7bc29d7330b1fc7c35813eb290
| * | | | | 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: I10fa393638f65f550e63b289e21be4d66dc1cce1
| * | | | | 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: I409e037bcb7c3ec712326fbded1e354bc92d3bd7
| * | | | 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: I9260146d48ff100437308a2138942fdc1cc785a2
| * | | | | 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: Ibc2b001cce0f3192b64ec957252d631f6f5c68a1