Commit Graph

1295 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK e0c4c24cfa Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot(). am: 150febcc65 am: 3634d2026c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893579

Change-Id: I0069b6e9f429be5b51cbcb6fbc0b634136cad757
2021-03-19 03:26:20 +00:00
Fraunhofer IIS FDK e91120f6b7 Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC. am: 3ebe6ffe95 am: b29e70b86c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893578

Change-Id: I3a5bb7a14bf0f3066822ae92d419ce326cfaad27
2021-03-19 03:26:19 +00:00
Fraunhofer IIS FDK fa6aba363d Evaluate and return StoreConfigAsBitstream() error state. am: 702d914e1a am: 87ec9dc4b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893577

Change-Id: I2686674890cda03234dbaf954cf576657e21008a
2021-03-19 03:26:17 +00:00
Fraunhofer IIS FDK e2ebbcd4c7 Check transportDec_OutOfBandConfig() input buffer size parameter. am: ef5f44c760 am: 4ee3d5e502
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893576

Change-Id: I44b080cdce04ccf7899884c2d4cfd3362b2bd50b
2021-03-19 03:26:15 +00:00
Fraunhofer IIS FDK 299b5cfd7c ELD downscale factor 3 is only allowed for framesize 480. am: 18758b9fe1 am: a98b84dad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893575

Change-Id: Ia736223ff975b702d63aba06db12cabb1fe1a00e
2021-03-19 03:26:13 +00:00
Fraunhofer IIS FDK 4dd6948876 Improve decoder robustness by storing flags and elFlags temporarily. am: b93f896f37 am: bdf161824b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893574

Change-Id: I6904208dfaf8c158d33237c860942cb4e312ffea
2021-03-19 03:26:11 +00:00
Fraunhofer IIS FDK e9396621d3 Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm(). am: a1a8f69b14 am: 1e1d714dd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893573

Change-Id: I13f43344216b3d953a39200e2565a0b4409575cd
2021-03-19 03:26:09 +00:00
Fraunhofer IIS FDK aabad641bc Check number of core channels and SAC decoder input channels to avoid a channel mismatch. am: 87e01ef1e7 am: c7f9c11adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893572

Change-Id: I0910b1fa2a5bf1153333b01bf4a214baeeab9a0c
2021-03-19 03:26:06 +00:00
Fraunhofer IIS FDK 473403d571 Prevent integer overflow in subbandTPApply() energy update. am: e916be37f2 am: 1f9f6958c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893571

Change-Id: Ibd97bb78f1e3d42a210edf4a5a8ff639daa6479e
2021-03-19 03:26:04 +00:00
Fraunhofer IIS FDK af40b10e95 Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise(). am: ba54a5c040 am: d40cec83ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893570

Change-Id: I293c2bcb4de6aaf609ba067688f8574f732be6e8
2021-03-19 03:26:02 +00:00
Fraunhofer IIS FDK 9542492f21 Avoid integer overflow in dct_II(). am: 19c8cc495e am: 7f707f8057
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893569

Change-Id: I9b2e017443215c646b67471a5c5babb4886b2a49
2021-03-19 03:26:00 +00:00
Fraunhofer IIS FDK cd4b6095c3 Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering(). am: 614b9f005a am: a948ff1cd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893568

Change-Id: Ie1b7ec7af6e41e095d93253c8ecc4eb63d50d295
2021-03-19 03:25:58 +00:00
Fraunhofer IIS FDK 3ec23a0ac3 Adjust VBR mode depending on given peak bitrate and fix crash recovery usage. am: f89d1d0a4e am: f04901b42a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893567

Change-Id: Icbb5dab11813dda07c2bf945781ef2b3e720e002
2021-03-19 03:25:56 +00:00
Fraunhofer IIS FDK 3634d2026c Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot(). am: 150febcc65
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893579

Change-Id: Ibc4b1a850bd68399610ccf4984b7423f119258f8
2021-03-19 02:51:15 +00:00
Fraunhofer IIS FDK b29e70b86c Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC. am: 3ebe6ffe95
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893578

Change-Id: Ibe9ac12e3339569f502ba29cff3ae2828543405b
2021-03-19 02:51:13 +00:00
Fraunhofer IIS FDK 87ec9dc4b9 Evaluate and return StoreConfigAsBitstream() error state. am: 702d914e1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893577

Change-Id: I4c50ac58579ba0ab0efa1efec8cd84579003cb45
2021-03-19 02:51:11 +00:00
Fraunhofer IIS FDK 4ee3d5e502 Check transportDec_OutOfBandConfig() input buffer size parameter. am: ef5f44c760
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893576

Change-Id: I3774fc7e9af8e3ae2df9533625a82ae5072f3494
2021-03-19 02:51:09 +00:00
Fraunhofer IIS FDK a98b84dad0 ELD downscale factor 3 is only allowed for framesize 480. am: 18758b9fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893575

Change-Id: I7ad315dd40ec894650808503136b1e223df38fc6
2021-03-19 02:51:07 +00:00
Fraunhofer IIS FDK bdf161824b Improve decoder robustness by storing flags and elFlags temporarily. am: b93f896f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893574

Change-Id: Id0cce2d6202fa4aca32bfab283317793a84195e4
2021-03-19 02:51:05 +00:00
Fraunhofer IIS FDK 1e1d714dd1 Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm(). am: a1a8f69b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893573

Change-Id: I9bba810c814f2d68710a1d94df680e714241dbc4
2021-03-19 02:51:03 +00:00
Fraunhofer IIS FDK c7f9c11adf Check number of core channels and SAC decoder input channels to avoid a channel mismatch. am: 87e01ef1e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893572

Change-Id: I307d428eb2801a8a10b8aa4519979db550f1d688
2021-03-19 02:51:01 +00:00
Fraunhofer IIS FDK 1f9f6958c3 Prevent integer overflow in subbandTPApply() energy update. am: e916be37f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893571

Change-Id: I738274cd97a1c24d635d5c7f6a8efee8efc62e5c
2021-03-19 02:50:59 +00:00
Fraunhofer IIS FDK d40cec83ed Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise(). am: ba54a5c040
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893570

Change-Id: I84f177df0aaa55929682b56a7bf2902c4f5fb9e7
2021-03-19 02:50:57 +00:00
Fraunhofer IIS FDK 7f707f8057 Avoid integer overflow in dct_II(). am: 19c8cc495e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893569

Change-Id: I806a23071a940dbdb74d0e921c2b7312ae7c856b
2021-03-19 02:50:55 +00:00
Fraunhofer IIS FDK a948ff1cd4 Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering(). am: 614b9f005a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893568

Change-Id: Ibcb7694e41a6836f5c46901cce534ea3d8813ab2
2021-03-19 02:50:53 +00:00
Fraunhofer IIS FDK f04901b42a Adjust VBR mode depending on given peak bitrate and fix crash recovery usage. am: f89d1d0a4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893567

Change-Id: I45a95e5562b8e7b8fef1e27d5e1aa28df1f1325f
2021-03-19 02:50:51 +00:00
Xin Li b3f525e5a7 [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s 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
2021-02-20 16:41:27 +00:00
Xin Li c726622078 [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s 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
2021-02-20 15:36:48 +00:00
Xin Li 10a3289cdd [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -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: Ia658697341d335415b30e7c47015c78cbc308c34
2021-02-20 14:53:59 +00:00
Xin Li 6d10f91a77 Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: Id04d2590c249cad13da8dd8975d0a12ce96a9597
Change-Id: I4da99b78b01817308d8572d3c0d5b224b7d36a73
2021-02-20 00:24:02 -08:00
Bob Badour 5a8db9346c Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7 am: 2020366ce7 am: 24a33f559c
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1fd6df26e6dab8ef19de7b1a889bc3ec1544867
2021-02-17 20:31:02 +00:00
Bob Badour 24a33f559c Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7 am: 2020366ce7
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I889815ab215531c3f2cd8a166c257ab9d00dbe8f
2021-02-17 19:43:57 +00:00
Bob Badour 2020366ce7 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12c397ed7120bed1014941d0b1413d2bf9c29bb5
2021-02-17 18:48:56 +00:00
Treehugger Robot 6c28745360 Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f am: 80ccc5df59 am: 80ec04f39f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I959fcfd422c98426ddd36e355abe73e8c48d442d
2021-02-17 18:22:58 +00:00
Bob Badour 7ad87e81d7 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37a9304f439a0ed700126de649a37378d03ce6bc
2021-02-17 18:07:22 +00:00
Treehugger Robot 80ec04f39f Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f am: 80ccc5df59
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95a53a55339caf67184bb3c8fc8c562c634bb159
2021-02-17 17:37:17 +00:00
Bob Badour 9f1be9d06f Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" 2021-02-17 17:32:45 +00:00
Treehugger Robot 80ccc5df59 Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5758ea2841ee0323b20459e0a2dabacd509c14ca
2021-02-17 17:01:02 +00:00
Treehugger Robot b3ae2fd27f Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib28a2522296895dec1d6a5cc465a7427e19ab93a
2021-02-17 16:22:30 +00:00
Treehugger Robot dde78303e8 Merge "Fix improper assignment in aac_enc_fuzzer" 2021-02-17 15:54:03 +00:00
Anuj Joshi b50bd1751d Fix improper assignment in aac_enc_fuzzer
This commit updates the fuzzer to use correct value of
kSignalingModesSize and prevent OOB access on kSignalingModes

Test: ./aac_enc_fuzzer
Bug: 180220144

Change-Id: Ic9d01c5c166f2291d8d8ffacaa7813fb1560322b
2021-02-17 17:01:03 +05:30
Fraunhofer IIS FDK 150febcc65 Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot().
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I5bded2e3d29278bb5df561eaa2a46d963ee21df8
2021-02-14 12:22:09 -08:00
Fraunhofer IIS FDK 3ebe6ffe95 Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I75edf24b18e1f5392b6eb179d5574cb93fcbc7c2
2021-02-14 12:22:00 -08:00
Fraunhofer IIS FDK 702d914e1a Evaluate and return StoreConfigAsBitstream() error state.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I025e943e91f9be1a5259a761a8ff88defd8babea
2021-02-14 12:21:52 -08:00
Fraunhofer IIS FDK ef5f44c760 Check transportDec_OutOfBandConfig() input buffer size parameter.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I60ac86f09a5652c820d60dfdc12212637f888164
2021-02-14 12:21:44 -08:00
Fraunhofer IIS FDK 18758b9fe1 ELD downscale factor 3 is only allowed for framesize 480.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9681942ba39761e4f1d66236ad80c2420ca5abe9
2021-02-14 12:21:33 -08:00
Fraunhofer IIS FDK b93f896f37 Improve decoder robustness by storing flags and elFlags temporarily.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I6aaeef87e1f2ce5d5031f088b8c57e6f5806929d
2021-02-14 12:21:24 -08:00
Fraunhofer IIS FDK a1a8f69b14 Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm().
Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I198747688f1677b82f27a17a2fcf40229c92b1da
2021-02-14 12:21:14 -08:00
Fraunhofer IIS FDK 87e01ef1e7 Check number of core channels and SAC decoder input channels to avoid a channel mismatch.
Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ib8b6973e9c29e13b8ef33d7736be2b977928face
2021-02-14 12:21:04 -08:00
Fraunhofer IIS FDK e916be37f2 Prevent integer overflow in subbandTPApply() energy update.
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9ed8b33414907706808956cffad252052928c799
2021-02-14 12:20:56 -08:00