fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,598 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

1598 Commits

Author SHA1 Message Date
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
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 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
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 b8242b65ac Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: I2a97958a7c0e20f6ca2f7880b430d932ae5a1c9b
 2021-04-30 14:57:37 +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 5a83a8e5e1)
 2021-04-30 14:31:01 +00:00
Fraunhofer IIS FDK 9a9d260375 Validate whether all PCE listed element instance tags are present in raw_data_block. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I299d3c11ffa65a7c09c437cd114d62b8d3013e2f
 2021-04-29 17:55:41 -07:00
Fraunhofer IIS FDK 14db264786 Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Icaedd341f4602882f72ff5e7be71d99ce08f3bec
 2021-04-29 13:08:13 -07: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
Martin Storsjo 801f67f671 Bump the versions and add changelog entries for v2.0.2 2021-04-28 15:34:15 +03:00
Martin Storsjo 143b2537d9 Add files missing from EXTRA_DIST 2021-04-28 15:33:56 +03:00
Martin Storsjo 9e8181c03b Specify the macOS compatibility version to make it a drop-in replacement for the libtool built 2021-04-28 15:33:55 +03:00
Martin Storsjo b0789a3438 Don't use enums for values read directly from the bitstream 
The enums don't cover all possible values read from the bitstream.

This fixes undefined behaviour sanitizer errors.

Fixes: 31011/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-4981228811976704

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2021-04-23 16:09:58 +03:00
Staz M 5329a829a0 Made this compatible with cmake version 3.5.1 2021-04-07 14:51:50 +03:00
Anuj Joshi 5f80d21a8a Stop using __DATE__/__TIME__ on all builds am: edbf93589b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670

Change-Id: Iaef3e0e1066e8e352b9ce3849bbce9fdc79d9d6d
 2021-03-19 02:51:38 +00:00