1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-08 15:48:43 +01:00

1664 Commits

Author SHA1 Message Date
Xin Li
fec72c2c90 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335

Change-Id: Ie7bbc6582a27a2fde3560a02d1f124418fdea0c7
2021-08-17 20:32:44 +00:00
Xin Li
d327f4f001 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335

Change-Id: Ic2f02ed8fd742c45860ecc2989fb060233d6701c
2021-08-17 19:46:39 +00:00
Xin Li
472cef1b5e [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335

Change-Id: Ic566c9da8ba56244997e125548f2b643708054d1
2021-08-17 18:36:09 +00:00
Xin Li
a950cd9905 Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9
Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
2021-08-14 06:31:12 +00:00
Xin Li
6f8272c394 Merge sc-mainline-prod
Bug: 189946434
Change-Id: I2cb3cdc88d8b13af7d822e97ee6c5edccdeb7795
2021-06-02 16:48:45 +00:00
TreeHugger Robot
a71807d0be Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev am: d2c2a20682 am: dcb2d8bd81 am: 4b2c62dd4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063

Change-Id: I017195d5638fe2b4cab9af37738b89b4b2097024
2021-05-17 22:52:53 +00:00
TreeHugger Robot
469c91683b Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 am: ace123a6c7 am: 10896bded2
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902

Change-Id: I3153f9a116981288a7c6fb418ec3e7b1ebb8ea9e
2021-05-17 22:52:27 +00:00
Fraunhofer IIS FDK
e93db08f12 Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: 1cf293e454 am: 8c620c3017
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: Ib3f6474771e968f95e86d7d55caabaf313b5e7a0
2021-05-17 22:51:56 +00:00
Fraunhofer IIS FDK
cd7cc91838 Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d am: 9b481d3556 am: 817f63d1d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: Ie6dee85b92955b3ebb74c2627cc2fa32b20dd5cb
2021-05-17 22:51:55 +00:00
Fraunhofer IIS FDK
54a56490c9 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33 am: 877f2d687c am: 71e84d7474
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

Change-Id: I78b6d17115260899c25667e9df31147a10eab903
2021-05-17 22:51:20 +00:00
Fraunhofer IIS FDK
759cd7a703 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642 am: b71181dec5 am: 1532a3d868
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259

Change-Id: Ib636a8e855a199dccac0be8b114e9f21cd54a45c
2021-05-17 22:50:43 +00:00
Fraunhofer IIS FDK
6744350d43 Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: 56de8e29ce am: 8077876e6d am: efc26a0576
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258

Change-Id: Ia2d4ee49d8af29b1ffe4912f9d7cb846797898d9
2021-05-17 22:50:07 +00:00
Fraunhofer IIS FDK
1ccf9429d3 Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows. am: 773ff1d3e8 am: 6bfd703af9 am: 3f62a2a1fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257

Change-Id: Iddaac5f930ea916bdec9df30989ef78f1d239a99
2021-05-17 22:49:25 +00:00
Fraunhofer IIS FDK
635998a36b Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf am: 675de1faf2 am: bc774411c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256

Change-Id: I8015d40ba35babdb25c59809c7702ee6269154d1
2021-05-17 22:43:08 +00:00
Fraunhofer IIS FDK
5e22d53e95 Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE(). am: 48e0fa028d am: ec3a5114d9 am: 91e7648127
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124

Change-Id: I100f79ebeae75f2b2b098815a8e1de8ba3987179
2021-05-17 22:42:23 +00:00
TreeHugger Robot
96bf993a3f Merge "Validate whether all PCE listed element instance tags are present in raw_data_block." into sc-dev am: 8d746cfdb4 am: 05692deb07 am: 546d75ecd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122

Change-Id: I7602a666497bc4bd7adcb252dc4766a47f4435b1
2021-05-17 22:41:47 +00:00
TreeHugger Robot
d7419132f2 Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e am: 97d79d7054 am: ba9f2fc54f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121

Change-Id: If74257d200781d61bb6eb066d5fca2e368014946
2021-05-17 22:41:07 +00:00
TreeHugger Robot
65fffef926 Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4 am: 480c182ae9 am: 086f4c9526
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

Change-Id: I4095801191f2f714fc44ae66e25771f677c57530
2021-05-17 22:40:24 +00:00
TreeHugger Robot
01490d9b51 Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157 am: f092b88a25 am: ca6441ca35
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

Change-Id: Ia4d9762e8e0a72ca1e0354226a8a67daf743b558
2021-05-17 22:39:32 +00:00
Fraunhofer IIS FDK
167e18cdd8 Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: b1dc10e5bc am: adf9fe784b am: 95f7178e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919

Change-Id: I5b67f200cca437d5e45d4e4b2a6c547af9078ea5
2021-05-17 22:33:23 +00:00
TreeHugger Robot
6615040107 Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev am: ab332a940d am: 24e69d4552 am: 2e550d0f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474

Change-Id: I60fe7fba89db014a8de771f67504b08e95206f6d
2021-05-17 22:32:32 +00:00
TreeHugger Robot
09483421cd Merge "Improve validation of channel indices in pcmDmx." into sc-dev am: 38afdcc7d0 am: 740116e266 am: a74df9ebb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123

Change-Id: Ide9f04a86ffe263be10713cd77e2edb44b1b5b0e
2021-05-17 22:31:11 +00:00
Jean-Michel Trivi
ac9bd7a96d Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev am: a37553e327 am: 52403628c8 am: 1f1fabc759
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879

Change-Id: I079ed55549cd5215e39e16731a60c0933d9def29
2021-05-17 22:30:07 +00:00
TreeHugger Robot
f47e6b74b2 Merge "Adjust data types to prevent load of invalid value" into sc-dev am: 9b9f051c92 am: 4f86d745ab am: b4018198dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853

Change-Id: If031d98d929f279c4dc31239123521d8feb076f2
2021-05-17 22:21:37 +00:00
TreeHugger Robot
f4a0f986c6 Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659 am: f893dbc6ee am: 97882bc3db
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929

Change-Id: I8de1a4a0379e9742ab3ba076365234ce501adfb5
2021-05-17 22:20:28 +00:00
TreeHugger Robot
d804aa7554 Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d am: 6213667f45 am: db0eb54a60
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930

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

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

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

Change-Id: I23e08a64b2b2c5afaeceb30c7aae4380275276c5
2021-05-17 22:09:20 +00:00
Fraunhofer IIS FDK
85b8ea5bc6 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: 5141e516de am: d22ea87339
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

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

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

Change-Id: I410d08f6d80587ac045bf7f00a63dd995bbf66b3
2021-05-17 21:53:01 +00:00
TreeHugger Robot
8acf73de36 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 am: 772a763080 am: f9f384ac37
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902

Change-Id: I723abbe61a98f16e2035c4ff0d0e19b21804344c
2021-05-17 21:48:40 +00:00
Fraunhofer IIS FDK
448e04cb34 Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: bac4f0675f am: 7e3add342f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: I48a50b0cd809dd895d602a27f4e94e8f5b86d142
2021-05-17 21:43:16 +00:00
Fraunhofer IIS FDK
222b82ea4b Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d am: 92dab635f7 am: 3db8ac7a00
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: I41fb9a013dd4d544ab4c1803127f3875fd5b7523
2021-05-17 21:43:15 +00:00
Fraunhofer IIS FDK
4789d3e8d2 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33 am: 4390bad523 am: 148544e625
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

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

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

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

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

Change-Id: Ie4f26371ddb10175959b20b5b13133b642d1d74d
2021-05-17 21:01:49 +00:00
Fraunhofer IIS FDK
af864c1866 Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE(). am: 48e0fa028d am: ff4ace52fa am: f3a2bc6ab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124

Change-Id: I1837589fa4b99f0c738edd9564a0b8795917f043
2021-05-17 20:49:56 +00:00
TreeHugger Robot
2f011a0831 Merge "Validate whether all PCE listed element instance tags are present in raw_data_block." into sc-dev am: 8d746cfdb4 am: c39393a732 am: 4d84420532
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122

Change-Id: I56e9204c37a75d88213a646627701df31d958cab
2021-05-17 20:35:15 +00:00
TreeHugger Robot
e67be75544 Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e am: ad6ba7f548 am: 8494edb8b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121

Change-Id: I97400b5e66ee05cbb92cf517adaf8028db62bc97
2021-05-17 20:18:59 +00:00
TreeHugger Robot
9bdedd0148 Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4 am: 47ee0b94ab am: 696a3cf9e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

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

Change-Id: I53d95ee4ead6144529815b256c599362ad9c2c5c
2021-05-17 20:03:29 +00:00
Fraunhofer IIS FDK
a442e18466 Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: b1dc10e5bc am: f708b26538 am: b97fd3d89f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919

Change-Id: I9ae377fd6bdd442244fae6d417079335aec9bf98
2021-05-17 19:49:40 +00:00
TreeHugger Robot
1c0a1825ca Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev am: ab332a940d am: 4c350fc3fc am: 03b6777510
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474

Change-Id: I98bacfbece6e8e022885fe93f8a81f8a91aa3048
2021-05-17 19:28:48 +00:00
TreeHugger Robot
4114af809f Merge "Improve validation of channel indices in pcmDmx." into sc-dev am: 38afdcc7d0 am: 46a636829c am: 3124e44e6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123

Change-Id: I8a3c04982a8738ac1e304b4e64ac315f1425c30c
2021-05-17 18:54:35 +00:00
Jean-Michel Trivi
0baa26e3fc Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev am: a37553e327 am: 2841b0ff99 am: 3310104edd
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879

Change-Id: I66642386cb2f55edb65c1f661f0424c4f5c9c3fd
2021-05-17 15:24:06 +00:00
TreeHugger Robot
5867f8cc5c Merge "Adjust data types to prevent load of invalid value" into sc-dev am: 9b9f051c92 am: 8ed5575e34 am: 8e4beaf191
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853

Change-Id: Icf85201c500775a87899ad8af9402969bc3f11a3
2021-05-17 15:16:18 +00:00