aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes I42956a9f,I92f7c559,I5af62590 into sc-devTreeHugger Robot2021-05-053-20/+27
|\ | | | | | | | | | | | | * 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().
| * Check the number of available escapes in rvlcDecodeBackward() to avoid ↵Fraunhofer IIS FDK2021-04-291-7/+8
| | | | | | | | | | | | | | | | out-of-bounds access. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I42956a9fd7a8e78c3c0f4f553370ac5a9f1ac2ca
| * Sbr syncstate may only be set to upsampling if the sbr decoder was ↵Fraunhofer IIS FDK2021-04-291-5/+11
| | | | | | | | | | | | | | | | sucessfully initialized. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I92f7c559af961ec063bfea74353f11092dcda653
| * Perform parameter check before parameter assignment to avoid incorrect ↵Fraunhofer IIS FDK2021-04-291-8/+8
| | | | | | | | | | | | | | | | initialization in resetFreqBandTables(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5af625905b1e4365fa84423d186c227a49707f72
* | 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: 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 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-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
| * | | | | 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-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 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
| * | | | | 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
| * | | | | 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-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
| * | | | 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().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().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
| * 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 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: 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: 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 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893666 Change-Id: Ibd0e9ca582177906d113b536a5c9851aa9c0c8c4
| * Fix wrong input buffer feed for PS encoder at less input samples than framesize.Fraunhofer IIS FDK2021-02-141-2/+2
| | | | | | | | | | | | | | Bug 177604812 Test: see PS/SBR encoder Change-Id: I08a20209bcb83784fda5c14584b6e99c65672545
* | Read uniDrcGainExtension element only if all DRC gain sequences are parsed ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | correctly. am: 0c2c08aef6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893665 Change-Id: I998dd24e53e8a17f41301b44576fa91d5d9f5a40
| * Read uniDrcGainExtension element only if all DRC gain sequences are parsed ↵Fraunhofer IIS FDK2021-02-141-5/+8
| | | | | | | | | | | | | | | | | | | | correctly. Prevent error return during parsing of incomplete uniDrcGain() element. This fixes unnecessary concealment of frames for AAC in case a uniDrcGain() is provided, but the uniDrcConfig() element is not available. Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5ae343eaea481774c53240dbce4da0f4ff06cd1d
* | Consider TNS headroom for complex prediction. am: 5e031b67baFraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893584 Change-Id: I8882d378afec8b7d2e683346c271c062aac21791
| * Consider TNS headroom for complex prediction.Fraunhofer IIS FDK2021-02-141-2/+4
| | | | | | | | | | | | Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I8261106b98d7e7c5a8a2af38585c726285ea8623
* | Fix USAC time domain limiter latency at config change. am: 09e7c40a3aFraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893583 Change-Id: I3d4c661ab94d6b1783e33b01d1c3573578b91b15
| * Fix USAC time domain limiter latency at config change.Fraunhofer IIS FDK2021-02-145-141/+156
| | | | | | | | | | | | | | | | | | | | We have observed quality problems regarding config switching for USAC streams. Crossfading did not consider the USAC time domain limiter latency correctly. The limiter memory still contained the last part of the frame before the config change. With this patch we were able to improve the quality by moving the limiter processing to the end of the processing chain (crossfade -> DRC -> limiter). By that we don't have to consider the limiter latency at the crossfader anymore and can resolve the quality issue. Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I0dfd3b76ff2b0daf495ad406283f56a39982ad8f Change-Id: I26f5da65ef8344602007e180e837820c6a25f173
* | Introduce additional sanity checks to validate program config element. am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | 82f6f3dac6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893582 Change-Id: If93b7326cc0418a1e649989b91298c65b53c2c48
| * Introduce additional sanity checks to validate program config element.Fraunhofer IIS FDK2021-02-141-11/+156
| | | | | | | | | | | | Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I3e04480ab5a74da1a9d09af5da95afb2000b3117
* | Validate DRC compression factor and DRC boost factor value range in ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | aacDecoder_SetParam(). am: baa3203971 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893581 Change-Id: I02c726264c22ec1f7e1169d457ac0848c77e89ca
| * Validate DRC compression factor and DRC boost factor value range in ↵Fraunhofer IIS FDK2021-02-141-0/+6
| | | | | | | | | | | | | | | | aacDecoder_SetParam(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I1d8534145bcf400c5da58d64d3b7e73a87cb43be
* | Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD(). am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | a7c64ff42f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893580 Change-Id: Iee18084b10e8063c77d7cd18180dd68b62cd5124
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 23:17:39 +0000