Commit Graph

1636 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK 6bfd703af9 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: Iac3f458c5f7381667bb72edb0246a38e8954ab13
2021-05-07 20:41:44 +00:00
Fraunhofer IIS FDK 675de1faf2 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: Ic04dff8bffc77eb7a178f816b9f67af1381f5a81
2021-05-07 20:41:39 +00:00
Fraunhofer IIS FDK d40c181a61 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: I650d87421f7b65025d308e0e148fe064796f2aac
2021-05-07 20:41:09 +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 c9d41b9d2f 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: I7ceb9658a16449db89ccda5de743b1c834f0ec10
2021-05-07 15:06:00 +00:00
Fraunhofer IIS FDK 03416e01c7 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: I49564df49b3eb4e604687c4f9d6b7a2f199f1b3a
2021-05-07 15:05:19 +00:00
Fraunhofer IIS FDK ec3a5114d9 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: Ib442c1ba18a5897d34369245eefc84d16c941574
2021-05-07 15:04:57 +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 fdec102c18 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: Ifa758ff72b8c099ba46edc06aa0a15522fddb25d
2021-05-06 20:55:11 +00:00
TreeHugger Robot 05692deb07 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: Iea02ef7cf0ed422eb6c30fb8ad10577f3c491b67
2021-05-06 20:55:09 +00:00
TreeHugger Robot 3b15a95c06 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: I75352e8ef2334785b18ace1c2d3b635ee700f02e
2021-05-06 20:55:08 +00:00
TreeHugger Robot 97d79d7054 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: I51b0c8c03fe7f1b6e14a802f7340e121d4186fe9
2021-05-06 20:54:51 +00:00
TreeHugger Robot 32bfe195a9 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: If933a862e97300cfe27f36d8adae9a1b2fd21bc7
2021-05-06 20:54:09 +00:00
TreeHugger Robot c49e0ec2c0 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: I2734f66d95df9031c855bef4b4dc49a7086ba811
2021-05-06 20:53:57 +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 480c182ae9 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: I57870b525ba546597390102d6c53dd847438c2cc
2021-05-05 01:24:10 +00:00
TreeHugger Robot f092b88a25 Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

Change-Id: I1ea355c9e3d4f6cd29111e57da1e0a08a7c7c16c
2021-05-05 01:24:03 +00:00
TreeHugger Robot 67f3797819 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: I8b176d329bcc8eec9abb4c59dede5f42b3b77bec
2021-05-05 01:24:01 +00:00
TreeHugger Robot ab552d65e6 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: I747f1d34cb96ee7bc29d7330b1fc7c35813eb290
2021-05-05 01:24:00 +00:00
TreeHugger Robot 4bb6385637 Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

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

Change-Id: Icbcbecac2ebf52606b92d1b2e086ae5657e79257
2021-05-05 01:23:41 +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 b9d46e0d97 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: Icaac4b6202939b4f4fb641ace5fc60b1daffbdeb
2021-05-01 02:10:44 +00:00
Fraunhofer IIS FDK adf9fe784b 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: I34977527f4f0b1585d35df4f3de04282975ac5dc
2021-05-01 02:10:43 +00:00
Fraunhofer IIS FDK 773fb32926 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: I409e037bcb7c3ec712326fbded1e354bc92d3bd7
2021-05-01 02:09:51 +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