fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-17 03:30:35 +01:00
Code Issues Projects Releases Wiki Activity
1,351 Commits 10 Branches 11 Tags
Commit Graph

1351 Commits

This Branch
This Branch
All Branches
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
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
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
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
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
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
Fraunhofer IIS FDK
5522e52e5a Prevent signed integer overflow in calc_qmfBufferReal(). 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I6d12fba9d958280ead368fcc4c6c5c79dc0111e2
 2021-04-30 15:29:59 +00:00
Fraunhofer IIS FDK
0e0a2f66d6 Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot(). 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I23ff345a1b1d0a8d125d49164fbd020387a37901
 2021-04-30 15:26:58 +00:00
Fraunhofer IIS FDK
ecc0e33206 Avoid signed integer overflow in combineSignalCplxScale2(). 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ie35e34d982c99f0e328f8f9251bba32c7da8518c
 2021-04-30 15:24:51 +00:00
Fraunhofer IIS FDK
7997eb4a73 Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 am: b7aee93697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: I8fa97fd0acad276f8e6c26f153027f4ace636f5a
 2021-04-30 15:22:05 +00:00
Fraunhofer IIS FDK
a43c9f8822 Prevent undefined values for CODING_SCHEME type in huff_decode(). 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I82da4a5660289d1c96888d48c315f96a4a5c1c2a
 2021-04-30 15:00:27 +00:00
Fraunhofer IIS FDK
b7aee93697 Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: I88a7881171286fdaa438a3c2aad49f3f9822b1e4
 2021-04-30 15:00:09 +00:00
Fraunhofer IIS FDK
de5b6b5def Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value. 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibf8dbc1e61ff0453ac905efc88892d39c84fece6
 2021-04-30 14:59:12 +00:00
Fraunhofer IIS FDK
1f5fac767a Adjust data types to prevent load of invalid value 
Adjust usacExtElementType data type to prevent load of invalid
value in extElementConfig().

Adjust usacConfigExtType data type to prevent load of invalid
value in configExtension().

Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ide15daa73c084c4a2cfc9d0f36bd7666fa6bac7a
 2021-04-30 14:44:19 +00:00
Fraunhofer IIS FDK
76104a5431 Avoid signed integer overflow in pcmLimiter_Apply(). 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I89f5206053926cb2f8726e4bc1ffb9fc88371edb
(cherry picked from commit 5a83a8e5e1cafceba6bef7ac61e68a57cc93d786)
 2021-04-30 14:31:01 +00:00
Fraunhofer IIS FDK
e15d049ded Use local variables for sbr and mps state in CAacDecoder_Init() to avoid inconsistencies in case of failing initialization. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ic767aeb63cdc7d4556bc68cee0c4f7aeba05d12f
 2021-04-29 12:59:09 -07:00
Fraunhofer IIS FDK
0527875be6 Follow-up on: Improve decoder robustness by storing flags and elFlags temporarily. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I2aef40ef1868832cd00e4d761b060aa41b1b7efa
 2021-04-29 12:57:20 -07:00
Fraunhofer IIS FDK
d8515f231f Use dynamic scaling depending on autocorr length to avoid signed integer overflow. 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibc035ce2eafe4b0d98377d090adad77bbf5cbb5c
 2021-04-29 19:13:22 +00:00