Commit Graph

1409 Commits

Author SHA1 Message Date
TreeHugger Robot db0eb54a60 Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d am: 6213667f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930

Change-Id: I84d34791370fbba64f41699c76931a1301b45930
2021-05-16 04:31:23 +00:00
TreeHugger Robot 6194400b60 Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100 am: 84bd0de621
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475

Change-Id: I3f6386f49e441ac79a309c981172598662cd97df
2021-05-16 03:48:37 +00:00
TreeHugger Robot 209d4af35a Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev am: b0a46baf90 am: 4f432296b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477

Change-Id: Ib3d0c7d42585d55d313c1931c1b2200e2d2bc2d9
2021-05-16 02:41:19 +00:00
TreeHugger Robot 62ef7efa0b Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev am: dff30034b9 am: a8f6f5847e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482

Change-Id: I046ac94369a1d5e285cd28f9aa33096be45775b2
2021-05-15 21:40:43 +00:00
Fraunhofer IIS FDK d22ea87339 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: 5141e516de
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: I70d87fcb84a09eb9cc5966540ae5bb13a0251009
2021-05-15 21:28:22 +00:00
Fraunhofer IIS FDK cbbc65cd31 Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: b8242b65ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: Iaa5232b15ba8254d270b8836b9902aede60270a0
2021-05-15 03:44:47 +00:00
TreeHugger Robot d0fe06a4cf Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev am: d2c2a20682 am: 214241aa94
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063

Change-Id: I2c35eacd3fa82f7001661142d75578fa39357b7a
2021-05-08 20:36:18 +00:00
TreeHugger Robot f9f384ac37 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value 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
2021-05-08 20:36:08 +00:00
TreeHugger Robot 214241aa94 Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev am: d2c2a20682
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063

Change-Id: Ie163d6025bf44400b1a470642610d78fc4fbcf1b
2021-05-08 20:14:13 +00:00
TreeHugger Robot 772a763080 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902

Change-Id: Ic237a72fec5930755faf4957dede78e7a74e9ffe
2021-05-08 20:14:07 +00:00
TreeHugger Robot d2c2a20682 Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev 2021-05-08 19:55:50 +00:00
TreeHugger Robot 4a9bfbf730 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev 2021-05-08 19:50:20 +00:00
Fraunhofer IIS FDK f724d3361f Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients().
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibd70f0c3e591d5581e5fe2a7469181bc0ba95a3c
2021-05-07 15:24:59 -07:00
Fraunhofer IIS FDK 7e3add342f Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: bac4f0675f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: I63ae90c7288f72ce534c33d04bb534b23244d396
2021-05-07 22:12:02 +00:00
Fraunhofer IIS FDK 3db8ac7a00 Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d am: 92dab635f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: I875ddf34a24a92655f0cfdefab55f0bcb355fdcb
2021-05-07 22:12:01 +00:00
Fraunhofer IIS FDK 148544e625 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33 am: 4390bad523
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

Change-Id: I00693eca7c3fac09f358d86e7a5a3d98c7ed029d
2021-05-07 22:11:57 +00:00
Fraunhofer IIS FDK ef265e496f Pass flushing flag to SBR module for stereo config index 3 as for stereo 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
2021-05-07 22:11:53 +00:00
Fraunhofer IIS FDK 1456244fff Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: 56de8e29ce am: cd41dbd325
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258

Change-Id: I10970daf44e125418edaab85a7f238c0251672a7
2021-05-07 22:11:49 +00:00
Fraunhofer IIS FDK bac4f0675f Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: Ib10f0ce06062a64b4ac89166ce040d41108adc3d
2021-05-07 21:52:09 +00:00
Fraunhofer IIS FDK 92dab635f7 Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: Id537737085575c0238e61369e03387832a48b7f8
2021-05-07 21:52:08 +00:00
Fraunhofer IIS FDK 4390bad523 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

Change-Id: I7a670cc313d190c72d5365f410916e93df458acc
2021-05-07 21:52:04 +00:00
Fraunhofer IIS FDK db4e46c9a6 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259

Change-Id: I907d00e50b06a21ddf3016ebd9e4dac713a5b6e4
2021-05-07 21:52:00 +00:00
Fraunhofer IIS FDK cd41dbd325 Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: 56de8e29ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258

Change-Id: I333d98de722a0fb4b94007a77236e503b8b7b3ca
2021-05-07 21:51:46 +00:00
Fraunhofer IIS FDK b0d57f7546 Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows. am: 773ff1d3e8 am: 1b074faaa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257

Change-Id: I304d50b4f3c7a5e2451ddf0a5407ade7fef70c07
2021-05-07 21:00:26 +00:00
Fraunhofer IIS FDK c0daf696e2 Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf am: babb5dce2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256

Change-Id: I86d6e5de19075554a043550fd79e6c95f82a1aa6
2021-05-07 20:59:38 +00:00
Fraunhofer IIS FDK 1b074faaa8 Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows. am: 773ff1d3e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257

Change-Id: Ic6d8ab1c4899aa7670074dd6011a2df85852d943
2021-05-07 20:44:40 +00:00
Fraunhofer IIS FDK babb5dce2f Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256

Change-Id: I6caaf0c53349cf38da263edcbccfdd49cbea624f
2021-05-07 20:43:10 +00:00
Fraunhofer IIS FDK 09cf32a6c7 Refine aacDecoder_DecodeFrame() output buffer parameter type description.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I83a460d03c7cde3e4f74011a7c3556c4cfd08cdd
2021-05-07 12:44:36 -07:00
Fraunhofer IIS FDK c2416f5e93 Add parameter pointer check to aacEncInfo() encoder API function.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf
2021-05-07 12:44:00 -07:00
Fraunhofer IIS FDK 2a40fde39d Prevent too large shift exponent in apply_inter_tes() and merge two loops.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I9ecb7fbae0a2c2c24af9067846afcf499b021608
2021-05-07 12:33:38 -07:00
Fraunhofer IIS FDK e5a14d0a33 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply().
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ib83bd37861e1e24ff18ea276244a370962808fcf
2021-05-07 12:32:45 -07:00
Fraunhofer IIS FDK 92dd536642 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ifed0885abdbbfb2e2d4d94bc482e5e1e30794049
2021-05-07 10:56:20 -07:00
Fraunhofer IIS FDK 56de8e29ce Utilize dynamic scaling in slotAmp() to avoid signed integer overflows.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ia66fbbd16dec4f9e04d67463cca91d75f3741131
2021-05-07 10:56:07 -07:00
Fraunhofer IIS FDK 773ff1d3e8 Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: If773c90ccd256fd03641446c7f8bd82d04a100e4
2021-05-07 10:55:24 -07:00
Fraunhofer IIS FDK 85a3977fdf Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding().
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I6237be90ed15e107cc4468770da7c330cdeef16f
2021-05-07 09:52:51 -07:00
Fraunhofer IIS FDK f3a2bc6ab5 Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE(). am: 48e0fa028d am: ff4ace52fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124

Change-Id: I43642d53262d80203945bd0523709de6c9150c65
2021-05-07 15:23:32 +00:00
Fraunhofer IIS FDK ff4ace52fa Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE(). am: 48e0fa028d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124

Change-Id: I4c7d4503727d5908e909dcc7999ce39517be7e08
2021-05-07 15:06:35 +00:00
Fraunhofer IIS FDK 48e0fa028d Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE().
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ifc4618b8de4e377df28e387fb976ab5acb5883d7
2021-05-06 14:40:19 -07:00
TreeHugger Robot 4d84420532 Merge "Validate whether all PCE listed element instance tags are present in 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
2021-05-06 21:11:49 +00:00
TreeHugger Robot 8494edb8b0 Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and 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
2021-05-06 21:11:43 +00:00
TreeHugger Robot c39393a732 Merge "Validate whether all PCE listed element instance tags are present in raw_data_block." into sc-dev am: 8d746cfdb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122

Change-Id: I4caa1c83fc5986f4d3a9c23ee8ca448a1d8131b7
2021-05-06 20:56:50 +00:00
TreeHugger Robot ad6ba7f548 Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and 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
2021-05-06 20:55:56 +00:00
TreeHugger Robot 8d746cfdb4 Merge "Validate whether all PCE listed element instance tags are present in raw_data_block." into sc-dev 2021-05-06 20:52:44 +00:00
TreeHugger Robot f633fc085e Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop." into sc-dev 2021-05-06 20:33:48 +00:00
TreeHugger Robot 696a3cf9e8 Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4 am: 47ee0b94ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

Change-Id: If591824a987260de27b479e8844906bbcd710031
2021-05-05 02:09:46 +00:00
TreeHugger Robot c7facc625a Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157 am: cffde9083d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

Change-Id: I68997798fa469bcec9a146560d0ac57357b4b69e
2021-05-05 02:09:12 +00:00
TreeHugger Robot 47ee0b94ab Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

Change-Id: Ib7da85b08a91c3182240487b0b4ded667f0d7f4a
2021-05-05 01:25:45 +00:00
TreeHugger Robot cffde9083d Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

Change-Id: If632a10eb3a9c8f738769ca7cf539c1a4d81e3ed
2021-05-05 01:25:39 +00:00
TreeHugger Robot 826719dee4 Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev
* 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().
2021-05-05 00:48:05 +00:00
TreeHugger Robot 2a3cde8157 Merge changes Ic767aeb6,I2aef40ef into sc-dev
* 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.
2021-05-05 00:41:58 +00:00