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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
24e69d4552
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: I88ee25478125c79da035237e4f1835df9f99020b
2021-05-01 00:15:35 +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
740116e266
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: Ia537fcb816c83e19b1343322aea27e40e9e6420a
2021-04-30 23:40:52 +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
52403628c8
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: Ibcd8380152b106378eb4b7b27eb6da67d327aca1
2021-04-30 22:53:28 +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
4f86d745ab
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: I6cb305c13a9ffe354a4a0cb89228a473c4688645
2021-04-30 22:21:49 +00:00
TreeHugger Robot
f893dbc6ee
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: I21fe94ad7e466311385d537fa64cae266ae190eb
2021-04-30 22:21:45 +00:00
TreeHugger Robot
6213667f45
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: Ib27b4b3d38bbc153a07ada7f5eaac6bd9a8abc8a
2021-04-30 22:21:40 +00:00
TreeHugger Robot
84bd0de621
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: I781b50c80d1e69068c3138c1d0388cf6809536eb
2021-04-30 22:21:35 +00:00
TreeHugger Robot
4f432296b9
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: Iff2c573663790abf3cd5695ec7a00e89bfd2eaa5
2021-04-30 22:21:20 +00:00
TreeHugger Robot
a8f6f5847e
Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev am: dff30034b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482
Change-Id: Idb4db4cce456c61c64fbd0885678414bf7d0ea45
2021-04-30 22:20:57 +00:00
TreeHugger Robot
9b9f051c92
Merge "Adjust data types to prevent load of invalid value" into sc-dev
2021-04-30 22:07:16 +00:00
TreeHugger Robot
427912f659
Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev
2021-04-30 22:06:24 +00:00
TreeHugger Robot
af61f20a8d
Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev
2021-04-30 22:05:35 +00:00
TreeHugger Robot
c0c3096100
Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev
2021-04-30 22:04:24 +00:00