aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Use local variables for sbr and mps state in CAacDecoder_Init() to avoid ↵Fraunhofer IIS FDK2021-04-291-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Follow-up on: Improve decoder robustness by storing flags and elFlags ↵Fraunhofer IIS FDK2021-04-291-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporarily. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I2aef40ef1868832cd00e4d761b060aa41b1b7efa
* | | | | | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431 am: ↵Fraunhofer IIS FDK2021-05-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1dc10e5bc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: Icaac4b6202939b4f4fb641ace5fc60b1daffbdeb
| * | | | | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 76104a5431Fraunhofer IIS FDK2021-05-010-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: Ib689c36358e8b3e5b2f5973c710e4d6d487b8562
| | * | | | | | Avoid signed integer overflow in pcmLimiter_Apply().Fraunhofer IIS FDK2021-04-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I89f5206053926cb2f8726e4bc1ffb9fc88371edb (cherry picked from commit 5a83a8e5e1cafceba6bef7ac61e68a57cc93d786)
* | | | | | | | Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into ↵TreeHugger Robot2021-05-011-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: ab332a940d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474 Change-Id: I02836ed3daff3993c8bcce77665e977c8f6ff6a3
| * | | | | | | Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-devTreeHugger Robot2021-04-301-6/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid signed integer overflow in combineSignalCplxScale2().Fraunhofer IIS FDK2021-04-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ie35e34d982c99f0e328f8f9251bba32c7da8518c
* | | | | | | | | Merge "Improve validation of channel indices in pcmDmx." into sc-dev am: ↵TreeHugger Robot2021-04-301-14/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38afdcc7d0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123 Change-Id: I3b27b7ffa17e683ad2f01ecdd6583baec569f881
| * | | | | | | | Merge "Improve validation of channel indices in pcmDmx." into sc-devTreeHugger Robot2021-04-301-14/+42
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve validation of channel indices in pcmDmx.Fraunhofer IIS FDK2021-04-301-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Bug: 170374298 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: If4d6f5fec266244b496c6ea08cd411badd9a31cf
* | | | | | | | | | Merge "Use dynamic scaling depending on autocorr length to avoid signed ↵Jean-Michel Trivi2021-04-301-22/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow." into sc-dev am: a37553e327 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879 Change-Id: I3c35d6347cafc9ace7bbcefd9d15213f257c5cae
| * | | | | | | | | Merge "Use dynamic scaling depending on autocorr length to avoid signed ↵Jean-Michel Trivi2021-04-301-22/+21
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow." into sc-dev
| | * | | | | | | | | Use dynamic scaling depending on autocorr length to avoid signed integer ↵Fraunhofer IIS FDK2021-04-291-22/+21
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow. Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibc035ce2eafe4b0d98377d090adad77bbf5cbb5c
* | | | | | | | | | Merge "Adjust data types to prevent load of invalid value" into sc-dev am: ↵TreeHugger Robot2021-04-301-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b9f051c92 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853 Change-Id: If6827db023c8ba6ee4da71cba1f6207ed0904bfb
| * | | | | | | | | Merge "Adjust data types to prevent load of invalid value" into sc-devTreeHugger Robot2021-04-301-5/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adjust data types to prevent load of invalid valueFraunhofer IIS FDK2021-04-301-5/+5
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into ↵TreeHugger Robot2021-04-301-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: 427912f659 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929 Change-Id: If55f330827c4c1356399c8a6c6edb24b7b08e773
| * | | | | | | | | Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-devTreeHugger Robot2021-04-301-6/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value.Fraunhofer IIS FDK2021-04-301-6/+11
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibf8dbc1e61ff0453ac905efc88892d39c84fece6
* | | | | | | | | | Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." ↵TreeHugger Robot2021-04-302-19/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev am: af61f20a8d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930 Change-Id: I1c3ce14ce976feed3c913882ddd7a8f2d907950b
| * | | | | | | | | Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." ↵TreeHugger Robot2021-04-302-19/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev
| | * | | | | | | | | Prevent undefined values for CODING_SCHEME type in huff_decode().Fraunhofer IIS FDK2021-04-302-19/+14
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I82da4a5660289d1c96888d48c315f96a4a5c1c2a
* | | | | | | | | | Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in ↵TreeHugger Robot2021-04-301-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475 Change-Id: I1373bf848ca878faa781b00814a2a027eb9618ba
| * | | | | | | | | Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in ↵TreeHugger Robot2021-04-301-14/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot()." into sc-dev
| | * | | | | | | | | Revise synthesis QMF scaling for PS to avoid integer overflow in ↵Fraunhofer IIS FDK2021-04-301-14/+10
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmfSynPrototypeFirSlot(). Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I23ff345a1b1d0a8d125d49164fbd020387a37901
* | | | | | | | | | Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev ↵TreeHugger Robot2021-04-301-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b0a46baf90 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477 Change-Id: I586c62c28581e2bb0593c9a2833682b575c80daf
| * | | | | | | | | Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-devTreeHugger Robot2021-04-301-14/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Prevent signed integer overflow in calc_qmfBufferReal().Fraunhofer IIS FDK2021-04-301-14/+14
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I6d12fba9d958280ead368fcc4c6c5c79dc0111e2
* | | | | | | | | | Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." ↵TreeHugger Robot2021-04-302-194/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-dev am: dff30034b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482 Change-Id: I9895067d725d564d1c9708cd8c6a921cd94b25aa
| * | | | | | | | | Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." ↵TreeHugger Robot2021-04-302-194/+31
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | into sc-dev
| | * | | | | | | | Prevent signed integer overflow in complex path of calc_qmfBuffer().Fraunhofer IIS FDK2021-04-302-194/+31
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Iae0581ea983912bcf1bc6b3bdc2c0d8ee2f6248e
* | | | | | | | | Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4Fraunhofer IIS FDK2021-04-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: Ia6a25fd44b97252815232a48e043da744fee3376
| * | | | | | | | Fix stack buffer overflow in Pred_lt4().Fraunhofer IIS FDK2021-04-301-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Bug: 160187491 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I3b8d9326319cca21145cc246588b01c5bf29a9a0
* | | | | | | | Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1Fraunhofer IIS FDK2021-04-301-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: I798d862bd7532eb5c4c11789358389ce81eb1d1f
| * | | | | | | Avoid signed integer overflow in pcmLimiter_Apply().Fraunhofer IIS FDK2021-04-291-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I89f5206053926cb2f8726e4bc1ffb9fc88371edb
* | | | | | | Stop using __DATE__/__TIME__ on all builds am: edbf93589b am: 5f80d21a8aAnuj Joshi2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670 Change-Id: I50e629a1bd07ddf3985a280c32678c446201bac9
| * | | | | | Stop using __DATE__/__TIME__ on all builds am: edbf93589bAnuj Joshi2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670 Change-Id: Iaef3e0e1066e8e352b9ce3849bbce9fdc79d9d6d
| | * | | | | Stop using __DATE__/__TIME__ on all buildsAnuj Joshi2021-02-1412-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: mmma external/libaac Bug: 151595970 Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
* | | | | | | Solve issue regarding config changes between Loudness-only vs. Loudness+DRC. ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a4695298d6 am: 830d2d033c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893669 Change-Id: I0d777fd2e5cdd9fa874708494c30e04abd42d539
| * | | | | | Solve issue regarding config changes between Loudness-only vs. Loudness+DRC. ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a4695298d6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893669 Change-Id: Iacec8ed463772b387d576bbd00efe9c110ee775a
| | * | | | | Solve issue regarding config changes between Loudness-only vs. Loudness+DRC.Fraunhofer IIS FDK2021-02-142-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix config changes from Loudness+DRC to Loudness-only configurations by clearing the DRC configuration Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I7afef848308478c29a82b13f24ba8c2a9760fd45
* | | | | | | Overcome SBR encoder coupling quality issue in ELD. am: edab3e30d6 am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67bd65ae2b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893668 Change-Id: I9a743f343325b5a9b6cd17b2ab77f936fc5950f9
| * | | | | | Overcome SBR encoder coupling quality issue in ELD. am: edab3e30d6Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893668 Change-Id: Ifb69e3d270de293c728bdc01b1e813bcc0209e3f
| | * | | | | Overcome SBR encoder coupling quality issue in ELD.Fraunhofer IIS FDK2021-02-142-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 177604812 Test: see SBR/PS encoder Change-Id: Ie7b9f8d1dec3708557d1e1189d45bc0e3bf5444c
* | | | | | | Fix input buffer flushing for PS encoder. am: 4fbc97cc47 am: 1e6b9e0283Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893667 Change-Id: I7a6aa1f9625290deac2499d4ba46707f16869507
| * | | | | | Fix input buffer flushing for PS encoder. am: 4fbc97cc47Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893667 Change-Id: Ib70ddabdd291ac167f1150c1d9b3038499268b01
| | * | | | | Fix input buffer flushing for PS encoder.Fraunhofer IIS FDK2021-02-141-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 177604812 Test: see PS/SBR encoder Change-Id: I3152bd7db5e039ecc54885e5b58c1cf6cb598b28
* | | | | | | Fix wrong input buffer feed for PS encoder at less input samples than ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framesize. am: bd021e7fb4 am: c66c41726b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893666 Change-Id: I7bda1e6c65ca0535e0ec5ff7d093a849ff084953
| * | | | | | Fix wrong input buffer feed for PS encoder at less input samples than ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framesize. am: bd021e7fb4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893666 Change-Id: Ibd0e9ca582177906d113b536a5c9851aa9c0c8c4