1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-13 09:50:40 +01:00

1380 Commits

Author SHA1 Message Date
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
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
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
Fraunhofer IIS FDK
b97fd3d89f Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: b1dc10e5bc am: f708b26538
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919

Change-Id: Ia46125b36c23e96e0b40595b617947f283cba1aa
2021-05-01 02:33:05 +00:00
Fraunhofer IIS FDK
f708b26538 Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: b1dc10e5bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919

Change-Id: I5807efd132d61353cf9211ad94eb0caf0720f7b4
2021-05-01 02:12:47 +00:00
Fraunhofer IIS FDK
b1dc10e5bc Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919

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

Change-Id: I65ab34b1b25c999fded1364e430a914753e377c5
2021-05-01 00:23:27 +00:00
TreeHugger Robot
4c350fc3fc Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev am: ab332a940d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474

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

Change-Id: Ic1169b5be36ce52bd1336b8b91e385c642a603a5
2021-05-01 00:15:54 +00:00
TreeHugger Robot
ab332a940d Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev 2021-04-30 23:52:10 +00:00
TreeHugger Robot
46a636829c Merge "Improve validation of channel indices in pcmDmx." into sc-dev am: 38afdcc7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123

Change-Id: I8fa1e312041703cf3a7ba316e6c0bb65c0b52176
2021-04-30 23:44:23 +00:00
TreeHugger Robot
38afdcc7d0 Merge "Improve validation of channel indices in pcmDmx." into sc-dev 2021-04-30 23:19:57 +00:00
Jean-Michel Trivi
3310104edd Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev am: a37553e327 am: 2841b0ff99
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879

Change-Id: Iadf6fbaf267c2650eae872de60064f1f98cc7afc
2021-04-30 22:55:14 +00:00
TreeHugger Robot
8e4beaf191 Merge "Adjust data types to prevent load of invalid value" into sc-dev am: 9b9f051c92 am: 8ed5575e34
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853

Change-Id: If5a0a8f46d213f30b867d5e705852d62b1161fa1
2021-04-30 22:55:10 +00:00
TreeHugger Robot
e054184edc Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659 am: 3a8d94cb27
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929

Change-Id: Ib56411cfa0c824beb33af77420ed414ad46459c9
2021-04-30 22:55:06 +00:00
TreeHugger Robot
1fcc47f50f Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d am: 851785f791
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930

Change-Id: I8dfd4b3dd4d9f0259137cc29fd68fc3edf1fcdce
2021-04-30 22:55:01 +00:00
TreeHugger Robot
cb4a2b7820 Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100 am: 6f453aba85
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475

Change-Id: Id0cfaf7b3351cbac88f044229a26afd57224fdfa
2021-04-30 22:54:56 +00:00
TreeHugger Robot
2715520d9a Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev am: b0a46baf90 am: 69a6369082
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477

Change-Id: I992fff157090c6b811733bc4eafff3484bab9154
2021-04-30 22:54:50 +00:00
TreeHugger Robot
5a192951da Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev am: dff30034b9 am: 236cd75f1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482

Change-Id: I1186682bef5fc6a7324bcd8c6509e824dc466737
2021-04-30 22:53:15 +00:00
Jean-Michel Trivi
2841b0ff99 Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev am: a37553e327
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879

Change-Id: I4a47ed883fba05b56f2cde2d6005ba2a413392d5
2021-04-30 22:31:27 +00:00
Jean-Michel Trivi
a37553e327 Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev 2021-04-30 22:26:00 +00:00
TreeHugger Robot
8ed5575e34 Merge "Adjust data types to prevent load of invalid value" into sc-dev am: 9b9f051c92
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853

Change-Id: I0bf2e8c3d568ab250b9a2d774445c99565bdcc7c
2021-04-30 22:23:49 +00:00
TreeHugger Robot
3a8d94cb27 Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929

Change-Id: I3082ddac6b36ba301dd8ac6fa43541f265ab0735
2021-04-30 22:23:44 +00:00
TreeHugger Robot
851785f791 Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930

Change-Id: I05fe67470c83fe97b5f33bd1a1bbdb95febe0fd3
2021-04-30 22:23:39 +00:00
TreeHugger Robot
6f453aba85 Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475

Change-Id: I938e29b525376cc7793072d29307bfd1812b3cd6
2021-04-30 22:23:34 +00:00
TreeHugger Robot
69a6369082 Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev am: b0a46baf90
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477

Change-Id: If1e636f234a9ebd351d0358d79ac902f68167c7f
2021-04-30 22:23:29 +00:00