aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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 am: d6b2fee1a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893581 Change-Id: I3926abbc2634286f47faec0e87e1ba655d045a30
| * | 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 am: 8d150d51be Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893580 Change-Id: Ic0e74d2d8cdd4dc47159d42bc5b8ad9865cd23cf
| * | 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
| | * Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD().Fraunhofer IIS FDK2021-02-141-1/+3
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5eb0f88a55e856c427f9e4647332070f66e673c5
* | | Make sure that alphaValue is correctly initialized in ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_drcApplySlot(). am: 150febcc65 am: 3634d2026c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893579 Change-Id: I0069b6e9f429be5b51cbcb6fbc0b634136cad757
| * | Make sure that alphaValue is correctly initialized in ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | sbrDecoder_drcApplySlot(). am: 150febcc65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893579 Change-Id: Ibc4b1a850bd68399610ccf4984b7423f119258f8
| | * Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot().Fraunhofer IIS FDK2021-02-141-19/+34
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5bded2e3d29278bb5df561eaa2a46d963ee21df8
* | | Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC. ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 3ebe6ffe95 am: b29e70b86c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893578 Change-Id: I3a5bb7a14bf0f3066822ae92d419ce326cfaad27
| * | Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC. ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 3ebe6ffe95 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893578 Change-Id: Ibe9ac12e3339569f502ba29cff3ae2828543405b
| | * Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC.Fraunhofer IIS FDK2021-02-143-8/+24
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I75edf24b18e1f5392b6eb179d5574cb93fcbc7c2
* | | Evaluate and return StoreConfigAsBitstream() error state. am: 702d914e1a am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 87ec9dc4b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893577 Change-Id: I2686674890cda03234dbaf954cf576657e21008a
| * | Evaluate and return StoreConfigAsBitstream() error state. am: 702d914e1aFraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893577 Change-Id: I4c50ac58579ba0ab0efa1efec8cd84579003cb45
| | * Evaluate and return StoreConfigAsBitstream() error state.Fraunhofer IIS FDK2021-02-141-6/+10
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I025e943e91f9be1a5259a761a8ff88defd8babea
* | | Check transportDec_OutOfBandConfig() input buffer size parameter. am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | ef5f44c760 am: 4ee3d5e502 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893576 Change-Id: I44b080cdce04ccf7899884c2d4cfd3362b2bd50b
| * | Check transportDec_OutOfBandConfig() input buffer size parameter. am: ef5f44c760Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893576 Change-Id: I3774fc7e9af8e3ae2df9533625a82ae5072f3494
| | * Check transportDec_OutOfBandConfig() input buffer size parameter.Fraunhofer IIS FDK2021-02-141-2/+4
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I60ac86f09a5652c820d60dfdc12212637f888164
* | | ELD downscale factor 3 is only allowed for framesize 480. am: 18758b9fe1 am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | a98b84dad0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893575 Change-Id: Ia736223ff975b702d63aba06db12cabb1fe1a00e
| * | ELD downscale factor 3 is only allowed for framesize 480. am: 18758b9fe1Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893575 Change-Id: I7ad315dd40ec894650808503136b1e223df38fc6
| | * ELD downscale factor 3 is only allowed for framesize 480.Fraunhofer IIS FDK2021-02-141-2/+10
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9681942ba39761e4f1d66236ad80c2420ca5abe9
* | | Improve decoder robustness by storing flags and elFlags temporarily. am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | b93f896f37 am: bdf161824b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893574 Change-Id: I6904208dfaf8c158d33237c860942cb4e312ffea
| * | Improve decoder robustness by storing flags and elFlags temporarily. am: ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | b93f896f37 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893574 Change-Id: Id0cce2d6202fa4aca32bfab283317793a84195e4
| | * Improve decoder robustness by storing flags and elFlags temporarily.Fraunhofer IIS FDK2021-02-141-53/+82
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I6aaeef87e1f2ce5d5031f088b8c57e6f5806929d
* | | Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | fDivNorm(). am: a1a8f69b14 am: 1e1d714dd1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893573 Change-Id: I13f43344216b3d953a39200e2565a0b4409575cd
| * | Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | fDivNorm(). am: a1a8f69b14 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893573 Change-Id: I9bba810c814f2d68710a1d94df680e714241dbc4
| | * Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in ↵Fraunhofer IIS FDK2021-02-141-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | fDivNorm(). Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I198747688f1677b82f27a17a2fcf40229c92b1da
* | | Check number of core channels and SAC decoder input channels to avoid a ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | channel mismatch. am: 87e01ef1e7 am: c7f9c11adf Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893572 Change-Id: I0910b1fa2a5bf1153333b01bf4a214baeeab9a0c
| * | Check number of core channels and SAC decoder input channels to avoid a ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | channel mismatch. am: 87e01ef1e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893572 Change-Id: I307d428eb2801a8a10b8aa4519979db550f1d688
| | * Check number of core channels and SAC decoder input channels to avoid a ↵Fraunhofer IIS FDK2021-02-149-32/+51
| | | | | | | | | | | | | | | | | | | | | | | | channel mismatch. Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ib8b6973e9c29e13b8ef33d7736be2b977928face
* | | Prevent integer overflow in subbandTPApply() energy update. am: e916be37f2 ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 1f9f6958c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893571 Change-Id: Ibd97bb78f1e3d42a210edf4a5a8ff639daa6479e
| * | Prevent integer overflow in subbandTPApply() energy update. am: e916be37f2Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893571 Change-Id: I738274cd97a1c24d635d5c7f6a8efee8efc62e5c
| | * Prevent integer overflow in subbandTPApply() energy update.Fraunhofer IIS FDK2021-02-141-4/+4
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9ed8b33414907706808956cffad252052928c799
* | | Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | and adjustTimeSlotHQ_GainAndNoise(). am: ba54a5c040 am: d40cec83ed Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893570 Change-Id: I293c2bcb4de6aaf609ba067688f8574f732be6e8
| * | Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | and adjustTimeSlotHQ_GainAndNoise(). am: ba54a5c040 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893570 Change-Id: I84f177df0aaa55929682b56a7bf2902c4f5fb9e7
| | * Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() ↵Fraunhofer IIS FDK2021-02-141-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | and adjustTimeSlotHQ_GainAndNoise(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ib630d56a626ddd59a9155df38cda2011c3165346
* | | Avoid integer overflow in dct_II(). am: 19c8cc495e am: 7f707f8057Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893569 Change-Id: I9b2e017443215c646b67471a5c5babb4886b2a49
| * | Avoid integer overflow in dct_II(). am: 19c8cc495eFraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893569 Change-Id: I806a23071a940dbdb74d0e921c2b7312ae7c856b
| | * Avoid integer overflow in dct_II().Fraunhofer IIS FDK2021-02-141-15/+13
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I6c30c4dec3f85410c2748eb42d38f5eb72521ec5
* | | Prevent integer overflows in dualChannelFiltering() and ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | eightChannelFiltering(). am: 614b9f005a am: a948ff1cd4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893568 Change-Id: Ie1b7ec7af6e41e095d93253c8ecc4eb63d50d295
| * | Prevent integer overflows in dualChannelFiltering() and ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | eightChannelFiltering(). am: 614b9f005a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893568 Change-Id: Ibcb7694e41a6836f5c46901cce534ea3d8813ab2
| | * Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering().Fraunhofer IIS FDK2021-02-141-13/+13
| | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ic9217bbb3980807036ae6ae121e6ddb7cc1bce35
* | | Adjust VBR mode depending on given peak bitrate and fix crash recovery ↵Fraunhofer IIS FDK2021-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | usage. am: f89d1d0a4e am: f04901b42a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893567 Change-Id: Icbb5dab11813dda07c2bf945781ef2b3e720e002
| * | Adjust VBR mode depending on given peak bitrate and fix crash recovery ↵Fraunhofer IIS FDK2021-03-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | usage. am: f89d1d0a4e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893567 Change-Id: I45a95e5562b8e7b8fef1e27d5e1aa28df1f1325f
| | * Adjust VBR mode depending on given peak bitrate and fix crash recovery usage.Fraunhofer IIS FDK2021-02-144-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
* | | [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ↵Xin Li2021-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 10a3289cdd -s ours am: c726622078 -s ours am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53e6e4b91f7c54dc9ee702d7461fe36212c27aa4
| * | [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ↵Xin Li2021-02-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 10a3289cdd -s ours am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I351222fa379905cfb22d3d4a5c9022dda52a07cd
| | * \ [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s oursXin Li2021-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia658697341d335415b30e7c47015c78cbc308c34
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 22:01:51 +0000