1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-18 12:10:38 +01:00

1371 Commits

Author SHA1 Message Date
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
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
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
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
6625b74402 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: I02836ed3daff3993c8bcce77665e977c8f6ff6a3
2021-05-01 00:15:22 +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
9abe2071d1 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: I3b27b7ffa17e683ad2f01ecdd6583baec569f881
2021-04-30 23:43:01 +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
23308594fb 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: I3c35d6347cafc9ace7bbcefd9d15213f257c5cae
2021-04-30 22:53:38 +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
99cd9ab658 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: If6827db023c8ba6ee4da71cba1f6207ed0904bfb
2021-04-30 22:21:59 +00:00
TreeHugger Robot
e3039808a0 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: If55f330827c4c1356399c8a6c6edb24b7b08e773
2021-04-30 22:21:56 +00:00
TreeHugger Robot
d361b3d5c2 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: I1c3ce14ce976feed3c913882ddd7a8f2d907950b
2021-04-30 22:21:52 +00:00
TreeHugger Robot
e4f73d5c0d 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: I1373bf848ca878faa781b00814a2a027eb9618ba
2021-04-30 22:21:48 +00:00
TreeHugger Robot
19be9226f3 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: I586c62c28581e2bb0593c9a2833682b575c80daf
2021-04-30 22:21:37 +00:00
TreeHugger Robot
280e49f8f8 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: I9895067d725d564d1c9708cd8c6a921cd94b25aa
2021-04-30 22:21:28 +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
63bc562431 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: Ia6a25fd44b97252815232a48e043da744fee3376
2021-04-30 19:14:29 +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
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
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
e249d56343 Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: I798d862bd7532eb5c4c11789358389ce81eb1d1f
2021-04-30 14:58:36 +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
27c3a2bd1c Check the number of available escapes in rvlcDecodeBackward() to avoid out-of-bounds access.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I42956a9fd7a8e78c3c0f4f553370ac5a9f1ac2ca
2021-04-29 13:04:17 -07:00
Fraunhofer IIS FDK
a1edc32174 Sbr syncstate may only be set to upsampling if the sbr decoder was sucessfully initialized.
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I92f7c559af961ec063bfea74353f11092dcda653
2021-04-29 13:02:01 -07:00
Fraunhofer IIS FDK
cab99f4b6a Perform parameter check before parameter assignment to avoid incorrect initialization in resetFreqBandTables().
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I5af625905b1e4365fa84423d186c227a49707f72
2021-04-29 13:00:19 -07: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
Fraunhofer IIS FDK
5a83a8e5e1 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
2021-04-29 19:12:14 +00:00
Anuj Joshi
45c56d041b Stop using __DATE__/__TIME__ on all builds am: edbf93589b am: 5f80d21a8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670

Change-Id: I50e629a1bd07ddf3985a280c32678c446201bac9
2021-03-19 03:26:41 +00:00
Fraunhofer IIS FDK
2f106c58f3 Solve issue regarding config changes between Loudness-only vs. Loudness+DRC. am: a4695298d6 am: 830d2d033c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893669

Change-Id: I0d777fd2e5cdd9fa874708494c30e04abd42d539
2021-03-19 03:26:39 +00:00
Fraunhofer IIS FDK
207a4cee05 Overcome SBR encoder coupling quality issue in ELD. am: edab3e30d6 am: 67bd65ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893668

Change-Id: I9a743f343325b5a9b6cd17b2ab77f936fc5950f9
2021-03-19 03:26:37 +00:00
Fraunhofer IIS FDK
2383a87460 Fix input buffer flushing for PS encoder. am: 4fbc97cc47 am: 1e6b9e0283
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893667

Change-Id: I7a6aa1f9625290deac2499d4ba46707f16869507
2021-03-19 03:26:36 +00:00
Fraunhofer IIS FDK
285fc69da6 Fix wrong input buffer feed for PS encoder at less input samples than framesize. am: bd021e7fb4 am: c66c41726b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893666

Change-Id: I7bda1e6c65ca0535e0ec5ff7d093a849ff084953
2021-03-19 03:26:34 +00:00
Fraunhofer IIS FDK
7a41ce55d2 Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly. am: 0c2c08aef6 am: d3ade3d525
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893665

Change-Id: I4ff20a46fa2131b5bd1d884d6f7ae0cc28274965
2021-03-19 03:26:32 +00:00
Fraunhofer IIS FDK
d356fc5bb8 Consider TNS headroom for complex prediction. am: 5e031b67ba am: dd435f98de
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893584

Change-Id: Ibe70e73392e9213cfd662c566c879ab914ef5a37
2021-03-19 03:26:30 +00:00