1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-02 09:27:37 +01:00

1307 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK
b5940b9d1e Fix USAC time domain limiter latency at config change. am: 09e7c40a3a am: 0b8dc7f5ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893583

Change-Id: I9fed5911f416b38593d80585e4bfea7db4a355e8
2021-03-19 03:25:51 +00:00
Fraunhofer IIS FDK
58d29eb3b3 Introduce additional sanity checks to validate program config element. am: 82f6f3dac6 am: ac4a9990b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893582

Change-Id: I17f7c45897761741cb62ce3ca5aceeeec84d52f7
2021-03-19 03:25:49 +00:00
Fraunhofer IIS FDK
597313e438 Validate DRC compression factor and DRC boost factor value range in aacDecoder_SetParam(). am: baa3203971 am: d6b2fee1a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893581

Change-Id: I21d8d065e27b7c9396fb315a466d0d78041bf0f2
2021-03-19 03:25:47 +00:00
Fraunhofer IIS FDK
9f4c09846e Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD(). am: a7c64ff42f am: 8d150d51be
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893580

Change-Id: Ib88c88c221f54f86aa4ed47b2d6d1e6ee63e6996
2021-03-19 03:25:45 +00:00
Fraunhofer IIS FDK
fb51b8f4b8 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: I03d3278ba0eb2db77a6d33c21edf5e2dd11905ab
2021-03-19 03:25:43 +00:00
Fraunhofer IIS FDK
166c67099a 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: I90d8c6325ecaf3c1c1c797780eeea41775996593
2021-03-19 03:25:41 +00:00
Fraunhofer IIS FDK
d9e31b0700 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: Ic6f76d8631656088034e07e1573a49e6bd6df35a
2021-03-19 03:25:39 +00:00
Fraunhofer IIS FDK
52a206c940 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: I50fe4fe54c4204e4b3a0461d583190b57c4f0cfd
2021-03-19 03:25:36 +00:00
Fraunhofer IIS FDK
28d4ee7c57 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: Ic8c1d24c19f3d74a5b309394a3ce999f2f20c6b0
2021-03-19 03:25:34 +00:00
Fraunhofer IIS FDK
f7fe3b9b18 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: I7838577da3ccfeaae426703b7ef1b1d3411647d1
2021-03-19 03:25:32 +00:00
Fraunhofer IIS FDK
cd6f2b27e6 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: Ic6160d133e8230e8315667f98e55403a3b7a30aa
2021-03-19 03:25:30 +00:00
Fraunhofer IIS FDK
0e247f183d 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: Ida44b892a90c804eb20dde496b8d22a20ac01a25
2021-03-19 03:25:28 +00:00
Fraunhofer IIS FDK
c419180e46 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: I42f40b379ae405dcd4a87ed0d3185dc590460030
2021-03-19 03:25:26 +00:00
Fraunhofer IIS FDK
98b9c134a5 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: I08ae5cbc12f285250afcf8a5db623d81ec5c7daf
2021-03-19 03:25:25 +00:00
Fraunhofer IIS FDK
7c6b987fc0 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: I9d30b004a103014e61a2881df7dc5ded1e3b2dde
2021-03-19 03:25:23 +00:00
Fraunhofer IIS FDK
eac65eded1 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: Ied51faf01028a95104a479754dc2454204cfa5ff
2021-03-19 03:25:21 +00:00
Fraunhofer IIS FDK
678582779c 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: I09a8ea695781097f9f56433eb6e7870913cf6616
2021-03-19 03:25:19 +00:00
Fraunhofer IIS FDK
0b8dc7f5ac Fix USAC time domain limiter latency at config change. am: 09e7c40a3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893583

Change-Id: I3d4c661ab94d6b1783e33b01d1c3573578b91b15
2021-03-19 02:51:23 +00:00
Fraunhofer IIS FDK
ac4a9990b8 Introduce additional sanity checks to validate program config element. am: 82f6f3dac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893582

Change-Id: If93b7326cc0418a1e649989b91298c65b53c2c48
2021-03-19 02:51:21 +00:00
Fraunhofer IIS FDK
d6b2fee1a4 Validate DRC compression factor and DRC boost factor value range in aacDecoder_SetParam(). am: baa3203971
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893581

Change-Id: I02c726264c22ec1f7e1169d457ac0848c77e89ca
2021-03-19 02:51:19 +00:00
Fraunhofer IIS FDK
8d150d51be Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD(). am: a7c64ff42f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893580

Change-Id: Iee18084b10e8063c77d7cd18180dd68b62cd5124
2021-03-19 02:51:17 +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
27a2f364cb [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: Ia59fdb0a73c7f0a6957d93b06ed59156a706aeed
2021-02-20 16:40:18 +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
69179af1ee 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: I8b242f3f29aaba1a2b75deddf80c1caf967181b8
2021-02-17 20:28:37 +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
7fb40a5fbe 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: I23c603170477f2afaa2b0bf7c4718c89775beecf
2021-02-17 18:22:12 +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
09e7c40a3a Fix USAC time domain limiter latency at config change.
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
2021-02-14 12:22:54 -08:00