aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: ↵Fraunhofer IIS FDK2021-05-150-0/+0
|\ | | | | | | | | | | | | | | b8242b65ac Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: Iaa5232b15ba8254d270b8836b9902aede60270a0
| * 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: I2a97958a7c0e20f6ca2f7880b430d932ae5a1c9b
* | \ Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | description." into sc-dev am: d2c2a20682 am: 214241aa94 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063 Change-Id: I2c35eacd3fa82f7001661142d75578fa39357b7a
| * \ \ 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: Ie163d6025bf44400b1a470642610d78fc4fbcf1b
| | * \ \ 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 am: 772a763080 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902 Change-Id: I6b150cf9359dedb1aa1484e357d87dd9b6c97f6b
| * | | | | 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: Ic237a72fec5930755faf4957dede78e7a74e9ffe
| | * | | | 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: ↵Fraunhofer IIS FDK2021-05-073-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2416f5e93 am: bac4f0675f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062 Change-Id: I63ae90c7288f72ce534c33d04bb534b23244d396
| * | | | | 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: Ib10f0ce06062a64b4ac89166ce040d41108adc3d
| | * | | | 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 am: 92dab635f7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061 Change-Id: I875ddf34a24a92655f0cfdefab55f0bcb355fdcb
| * | | | | 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: Id537737085575c0238e61369e03387832a48b7f8
| | * | | | 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 am: 4390bad523 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060 Change-Id: I00693eca7c3fac09f358d86e7a5a3d98c7ed029d
| * | | | | 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: I7a670cc313d190c72d5365f410916e93df458acc
| | * | | | 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 am: db4e46c9a6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259 Change-Id: I6eeade1a212ac9bb17e9feb508cd7e2f0a965ce0
| * | | | | 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: I907d00e50b06a21ddf3016ebd9e4dac713a5b6e4
| | * | | | 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 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