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

1419 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
TreeHugger Robot
236cd75f1c 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: Ifc277eaaf09fc35c0f59f5eedd17c2f4cf652d45
2021-04-30 22:23:20 +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
TreeHugger Robot
b0a46baf90 Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev 2021-04-30 22:04:04 +00:00
TreeHugger Robot
dff30034b9 Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev 2021-04-30 22:03:58 +00:00
Fraunhofer IIS FDK
9ed084750d Improve validation of channel indices in pcmDmx.
Bug: 186777497
Bug: 170374298
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: If4d6f5fec266244b496c6ea08cd411badd9a31cf
2021-04-30 21:56:12 +00:00
Fraunhofer IIS FDK
6edbc9a7e8 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: d2aca9e020
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: Ie51264d592a1a2b6afbdf347b05ac5260e9ef1d0
2021-04-30 19:30:10 +00:00
Fraunhofer IIS FDK
d2aca9e020 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: Ied81b3004086b8bb5e58bb94e7600293e21ee553
2021-04-30 19:16:11 +00:00
Fraunhofer IIS FDK
5141e516de Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: Idd1012d6e024903e71e60e8b29820f484d431792
2021-04-30 19:14:12 +00:00
Fraunhofer IIS FDK
22e70729b4 Fix stack buffer overflow in Pred_lt4().
Bug: 186706541
Bug: 160187491
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I3b8d9326319cca21145cc246588b01c5bf29a9a0
2021-04-30 17:56:52 +00:00
Fraunhofer IIS FDK
ef864daeea Prevent signed integer overflow in complex path of calc_qmfBuffer().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Iae0581ea983912bcf1bc6b3bdc2c0d8ee2f6248e
2021-04-30 15:38:00 +00:00