aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Merge changes Ic767aeb6,I2aef40ef into sc-devTreeHugger Robot2021-05-051-22/+27
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * | | 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 am: f708b26538 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386919 Change-Id: Ia46125b36c23e96e0b40595b617947f283cba1aa
| * | | | 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: I5807efd132d61353cf9211ad94eb0caf0720f7b4
| | * | | 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 am: 4c350fc3fc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474 Change-Id: I65ab34b1b25c999fded1364e430a914753e377c5
| * | | | | 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: I12fcc01fba0918d33c9d802a614c97b7a3c33d6e
| | * | | | 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-05-011-14/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38afdcc7d0 am: 46a636829c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373123 Change-Id: Ic1169b5be36ce52bd1336b8b91e385c642a603a5
| * | | | | 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: I8fa1e312041703cf3a7ba316e6c0bb65c0b52176
| | * | | | 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 am: 2841b0ff99 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879 Change-Id: Iadf6fbaf267c2650eae872de60064f1f98cc7afc
| * | | | | | 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: I4a47ed883fba05b56f2cde2d6005ba2a413392d5
| | * | | | | 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 am: 8ed5575e34 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853 Change-Id: If5a0a8f46d213f30b867d5e705852d62b1161fa1
| * | | | | | 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: I0bf2e8c3d568ab250b9a2d774445c99565bdcc7c
| | * | | | | 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 am: 3a8d94cb27 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929 Change-Id: Ib56411cfa0c824beb33af77420ed414ad46459c9
| * | | | | | 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: I3082ddac6b36ba301dd8ac6fa43541f265ab0735
| | * | | | | 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 am: 851785f791 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930 Change-Id: I8dfd4b3dd4d9f0259137cc29fd68fc3edf1fcdce
| * | | | | | 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: I05fe67470c83fe97b5f33bd1a1bbdb95febe0fd3
| | * | | | | 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 am: 6f453aba85 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475 Change-Id: Id0cfaf7b3351cbac88f044229a26afd57224fdfa
| * | | | | | 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: I938e29b525376cc7793072d29307bfd1812b3cd6
| | * | | | | 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 am: 69a6369082 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477 Change-Id: I992fff157090c6b811733bc4eafff3484bab9154
| * | | | | | 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: If1e636f234a9ebd351d0358d79ac902f68167c7f
| | * | | | | 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 am: 236cd75f1c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482 Change-Id: I1186682bef5fc6a7324bcd8c6509e824dc466737
| * | | | | | 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: Ifc277eaaf09fc35c0f59f5eedd17c2f4cf652d45
| | * | | | | 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: 22e70729b4 am: d2aca9e020Fraunhofer IIS FDK2021-04-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: Ie51264d592a1a2b6afbdf347b05ac5260e9ef1d0
| * | | | | 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: Ied81b3004086b8bb5e58bb94e7600293e21ee553
| | * | | | 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: 5a83a8e5e1 am: ↵Fraunhofer IIS FDK2021-04-301-2/+3
|\| | | | | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | b7aee93697 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877 Change-Id: I8fa97fd0acad276f8e6c26f153027f4ace636f5a
| * | | 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: I88a7881171286fdaa438a3c2aad49f3f9822b1e4
| * / 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: edbf93589bAnuj Joshi2021-03-190-0/+0
|\| | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670 Change-Id: Iaef3e0e1066e8e352b9ce3849bbce9fdc79d9d6d