aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Introduce additional sanity checks to validate program config element."Jean-Michel Trivi2020-12-281-11/+156
|\
| * Introduce additional sanity checks to validate program config element.Fraunhofer IIS FDK2020-12-281-11/+156
| | | | | | | | | | | | Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I3e04480ab5a74da1a9d09af5da95afb2000b3117
* | Merge changes Ib8b6973e,I19874768TreeHugger Robot2020-12-289-49/+95
|\| | | | | | | | | | | * changes: Check number of core channels and SAC decoder input channels to avoid a channel mismatch. Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm().
| * Check number of core channels and SAC decoder input channels to avoid a ↵Fraunhofer IIS FDK2020-12-289-32/+51
| | | | | | | | | | | | | | | | channel mismatch. Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ib8b6973e9c29e13b8ef33d7736be2b977928face
| * Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in ↵Fraunhofer IIS FDK2020-12-281-17/+44
| | | | | | | | | | | | | | | | fDivNorm(). Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I198747688f1677b82f27a17a2fcf40229c92b1da
* | Merge changes I6aaeef87,I9681942b,I60ac86f0,I025e943e,I75edf24bTreeHugger Robot2020-12-285-71/+130
|\| | | | | | | | | | | | | | | | | * changes: Improve decoder robustness by storing flags and elFlags temporarily. ELD downscale factor 3 is only allowed for framesize 480. Check transportDec_OutOfBandConfig() input buffer size parameter. Evaluate and return StoreConfigAsBitstream() error state. Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC.
| * Improve decoder robustness by storing flags and elFlags temporarily.Fraunhofer IIS FDK2020-12-281-53/+82
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I6aaeef87e1f2ce5d5031f088b8c57e6f5806929d
| * ELD downscale factor 3 is only allowed for framesize 480.Fraunhofer IIS FDK2020-12-281-2/+10
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9681942ba39761e4f1d66236ad80c2420ca5abe9
| * Check transportDec_OutOfBandConfig() input buffer size parameter.Fraunhofer IIS FDK2020-12-281-2/+4
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I60ac86f09a5652c820d60dfdc12212637f888164
| * Evaluate and return StoreConfigAsBitstream() error state.Fraunhofer IIS FDK2020-12-281-6/+10
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I025e943e91f9be1a5259a761a8ff88defd8babea
| * Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC.Fraunhofer IIS FDK2020-12-283-8/+24
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I75edf24b18e1f5392b6eb179d5574cb93fcbc7c2
* | Merge "Make sure that alphaValue is correctly initialized in ↵TreeHugger Robot2020-12-281-19/+34
|\| | | | | | | sbrDecoder_drcApplySlot()."
| * Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot().Fraunhofer IIS FDK2020-12-281-19/+34
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5bded2e3d29278bb5df561eaa2a46d963ee21df8
* | Merge changes I5eb0f88a,I1d853414TreeHugger Robot2020-12-282-1/+9
|\| | | | | | | | | | | * changes: Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD(). Validate DRC compression factor and DRC boost factor value range in aacDecoder_SetParam().
| * Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD().Fraunhofer IIS FDK2020-12-281-1/+3
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5eb0f88a55e856c427f9e4647332070f66e673c5
| * Validate DRC compression factor and DRC boost factor value range in ↵Fraunhofer IIS FDK2020-12-231-0/+6
| | | | | | | | | | | | | | | | aacDecoder_SetParam(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I1d8534145bcf400c5da58d64d3b7e73a87cb43be
* | Merge "Prevent integer overflow in subbandTPApply() energy update."Jean-Michel Trivi2020-12-281-4/+4
|\|
| * Prevent integer overflow in subbandTPApply() energy update.Fraunhofer IIS FDK2020-12-231-4/+4
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9ed8b33414907706808956cffad252052928c799
* | Merge "Limit smoothedNoise values to avoid integer overflows in ↵Jean-Michel Trivi2020-12-281-1/+18
|\| | | | | | | adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise()."
| * Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() ↵Fraunhofer IIS FDK2020-12-231-1/+18
| | | | | | | | | | | | | | | | and adjustTimeSlotHQ_GainAndNoise(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ib630d56a626ddd59a9155df38cda2011c3165346
* | Merge "Avoid integer overflow in dct_II()."Jean-Michel Trivi2020-12-281-15/+13
|\|
| * Avoid integer overflow in dct_II().Fraunhofer IIS FDK2020-12-231-15/+13
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I6c30c4dec3f85410c2748eb42d38f5eb72521ec5
* | Merge "Prevent integer overflows in dualChannelFiltering() and ↵TreeHugger Robot2020-12-271-13/+13
|\| | | | | | | eightChannelFiltering()."
| * Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering().Fraunhofer IIS FDK2020-12-231-13/+13
| | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ic9217bbb3980807036ae6ae121e6ddb7cc1bce35
* | Adjust VBR mode depending on given peak bitrate and fix crash recovery usage.Fraunhofer IIS FDK2020-12-234-36/+83
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Operating the FDK encoder in A2DP with variable bitrate mode configuration resulted in unexpected encoder return value AACENC_ENCODE_ERROR. Due to peak bitrate restriction the encoder quite often runs into requantization. In case the bitrate constraint is not fulfilled, the so-called crash recovery is used as final emergency step. The crash recovery reduces the overall bit consumption considering the given number of bits to be saved. The bit difference is extracted from audio element structures. In VBR mode the element wise bit consumption state was not updated since there is typically no bitrate limitation required. The patch solves the choppy audio problems and increases audio quality for AAC VBR encoding. The changes in FDKaacEnc_QCMain() ensure that audio element bit info is always updated. This is achieved by always calling FDKaacEnc_BitResRedistribution() and FDKaacEnc_prepareBitDistribution() with maxBitsPerFrame variable as total bits parameter. Furthermore, VBR assumes a certain target bitrate which is used for internal configuration and limitations. In case the peak bitrate parameter is less than the VBR mode target bitrate the maximum of both bitrate configurations was used. The function FDKaacEnc_AdjustVBRBitrateMode() is added to adjust the encoder internal VBR mode to a desired target bitrate less than given peak bitrate. It is possible that the peak bitrate is very close to the desired target bitrate. The virtual available bitreservoir is quite low and the encoder would run quite often into requantization with needless audio quality reduction. In such a configuration, it is a better choice to use the CBR targeted threshold adaption to avoid audio quality reduction. In FDKaacEnc_Initialize(), there was already a bitResMode selection depending on available bitreservoir for CBR. This selection will now also be used for VBR. In case the bitResMode is AACENC_BR_MODE_FULL and VBR mode is selected, the VBR threshold adaption is used. Otherwise, CBR threshold adaption strategy is used and therefore, no unnecessary fill bits are written. Bug: 161400526 Test: see bug Change-Id: I1865f817180150da6add2623a64f1a102622784a
* Mark ab/6881855 as merged am: b831187d3a am: a5f0e4af6dXin Li2020-11-240-0/+0
|\ | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547 Change-Id: I9243e7da297d69b2bcb1f2d87a4b7a36c961e063
| * Mark ab/6881855 as merged am: b831187d3aXin Li2020-11-240-0/+0
| |\ | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547 Change-Id: Id04d2590c249cad13da8dd8975d0a12ce96a9597
| | * Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 172690556 Change-Id: I4edc064b9a87da525672e61919ec8fb59a70202e
* | | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am: de35b0d3cc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I01e518ed4a6d04fd21c673bd6fbf7c6739d21320
| * | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I9d8f11842a7d222ff9eaf50be2e44f1507c4bb49
| | * | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
| | | * | Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: ↵Bill Yi2020-11-050-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4adff7fbb Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ied811f647e67defe1286b9a8e4a0bdc2c89da3c2
| | | | * \ Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE"Bill Yi2020-11-051-6/+6
| | | | |\ \
* | | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am: 700bc783fb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I77b49175f9c8523aa87b1aa4b99a106bdaef25b6
| * | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc66ac802e4e6eec723e5e762cf94f107f5f7ba6
| | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ia3fae7d8939333684ff3ea15081ac69624d58873
| | | * | | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02aBill Yi2020-11-050-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc71d75171dfbc250f59774aea3ddb950e70d356
| | | | * | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGEBill Yi2020-11-041-6/+6
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Merged-In: I44e842648acbceb02bbc28cf2ad729a0caddf60d Change-Id: Iead5cf2ca1c993da0844a11d1e64bf3cc86ed5dd
* | | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am: 092c1fb7fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I8fc1c1761320ee974541e04597bba6d4f795575b
| * | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: Ib5460d11c6484d4794e75fcd4c9ba48a4b57a472
| | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
| | | * | | | Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGEBill Yi2020-11-031-6/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | | | | | | Merged-In: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d Change-Id: I462d697908f9803317f038c916d5942967efa28a
| | | | * | Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, ↵android-build-team Robot2020-09-161-6/+6
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
| | | | | * | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-161-6/+6
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e (cherry picked from commit bb8f983bf36ee2ad8af6acebf4823a58060004ab)
| | | | * | Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-releaseandroid-build-team Robot2020-05-301-0/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
| | | | * \ \ Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-releaseandroid-build-team Robot2020-05-121-0/+7
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
| | | | * \ \ \ Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-releaseandroid-build-team Robot2020-02-164-24/+3
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d56321205dbd74479a72ecbbde137a18eef044b
| | | | * \ \ \ \ Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-releaseandroid-build-team Robot2020-02-1559-904/+1111
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
| | | | * \ \ \ \ \ Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-releaseandroid-build-team Robot2020-02-144-104/+53
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide088e86f1ced06e7717f8d78d187058bc7db370
| | | | * \ \ \ \ \ \ Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-releaseandroid-build-team Robot2020-02-138-19/+71
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefbacc1498ce7caf6c6ccb2df4c8b4c6cca4ab76
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 11:09:49 +0000