Commit Graph

1639 Commits

Author SHA1 Message Date
TreeHugger Robot 97882bc3db Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659 am: f893dbc6ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929

Change-Id: I8a76227c5d3dbe7213c19953e94f9df701e8b7bb
2021-05-16 05:28:06 +00:00
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 e600f5260b Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: b7aee93697 am: 7997eb4a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: I7210851beb677d0fe260cdfb3a3a1dff98955f43
2021-05-15 06:11:24 +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 26eed59258 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: Iec55c398637d4906b7b89979c6292f9e26e012fe
2021-05-08 20:11:49 +00:00
TreeHugger Robot 951758e6d6 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: Id42fc123b39c431988b2549b56e9de12036a9020
2021-05-08 20:11:45 +00:00
TreeHugger Robot 25a60f6a27 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: Ife83d0980ab3a8a29db757dbe6aa7c39f0547633
2021-05-08 20:11:11 +00:00
TreeHugger Robot f67caf892c 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: If1e1fa8ba514f72fff2e14968f59e62ed2d07b3d
2021-05-08 20:11:05 +00:00
TreeHugger Robot dcb2d8bd81 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: I18d2a0819145e1f02c8868674eab081ab243f0a9
2021-05-08 20:11:03 +00:00
TreeHugger Robot ace123a6c7 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: Ib3cdd864f2f788d9a5c39be79cc37d626426565b
2021-05-08 20:10:57 +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 4d5ce23a6a 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: Iedde10c45bfcd36c647747d707babc44bfbe5730
2021-05-07 21:49:58 +00:00
Fraunhofer IIS FDK 1cf293e454 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: I9e1cb5ba113f5df4df76be7e1bee5e2cbdd8ccca
2021-05-07 21:49:57 +00:00
Fraunhofer IIS FDK 6fc7e4ae3a 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: I585bba83fcd1fd2c288b20f492cb72e377533f56
2021-05-07 21:49:57 +00:00
Fraunhofer IIS FDK 9b481d3556 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: Iaa3a1546fa0d8a92de3b1434b93d810b6e00e1a7
2021-05-07 21:49:56 +00:00
Fraunhofer IIS FDK e91474fcce 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: I033fc46b89137ad74135b36a3c2c9ccdf8de7bd4
2021-05-07 21:49:54 +00:00
Fraunhofer IIS FDK 877f2d687c 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: Idd546b91b3986a8b6cc24aee7dd74f34c04d3c98
2021-05-07 21:49:52 +00:00
Fraunhofer IIS FDK 5df817f938 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: I28a19b03795f2e51b679fade211f959fe75460e6
2021-05-07 21:49:51 +00:00
Fraunhofer IIS FDK b71181dec5 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: I8ea16bff79bee98ecc43d393eb07b27f858c15d2
2021-05-07 21:49:41 +00:00
Fraunhofer IIS FDK 1b5b22b9fc 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: If1dc7f802006ccf79587cd372e7b673b0f155dde
2021-05-07 21:49:18 +00:00
Fraunhofer IIS FDK 23c0776047 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: If4e702f228c4053c345a9141636b198d470b6070
2021-05-07 21:49:17 +00:00
Fraunhofer IIS FDK 7566b0355b 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: I5032ed2fc0536df8e16e5488128c8b9b94a70650
2021-05-07 21:49:13 +00:00
Fraunhofer IIS FDK 2289ce0344 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: Ic01ed1a89ebe6445b2cf107415a2d72bafe22863
2021-05-07 21:49:03 +00:00
Fraunhofer IIS FDK 8077876e6d 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: I919188f860f8c9a1eb629328ef7192a8d6554b11
2021-05-07 21:49:00 +00:00
Fraunhofer IIS FDK 6de1029823 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: I3dd86141caa1d65bb08206b0a86e27b72ace37fd
2021-05-07 21:48:49 +00:00
Fraunhofer IIS FDK 41c2942fda 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: I9959ecb8bb6f1283a701011af6f398dfaf2aa906
2021-05-07 21:48:07 +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 f20e11ed28 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: I568446484ac45601e15980652490e8cf9fc386eb
2021-05-07 20:43:17 +00:00