Commit Graph

1353 Commits

Author SHA1 Message Date
Jean-Michel Trivi e3fb585c48 Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev am: a37553e327
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355879

Change-Id: Ie6f00290f57cf8eebb192c1327d7c2dafe0abf8e
2021-04-30 22:53:13 +00:00
Jean-Michel Trivi a37553e327 Merge "Use dynamic scaling depending on autocorr length to avoid signed integer overflow." into sc-dev 2021-04-30 22:26:00 +00:00
TreeHugger Robot 89a1174551 Merge "Adjust data types to prevent load of invalid value" into sc-dev am: 9b9f051c92
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14381853

Change-Id: Ife10ac9ef4500627382e6a07b6934fe56376d9bd
2021-04-30 22:22:05 +00:00
TreeHugger Robot ba3603de6d Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929

Change-Id: I48ec7b7a48e5b21c25fdc5441aa541653a791f10
2021-04-30 22:22:00 +00:00
TreeHugger Robot 8b17753d3c Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930

Change-Id: Iba961d39a5ac2e4cfdb95a53a11196b794d82cf1
2021-04-30 22:21:54 +00:00
TreeHugger Robot 1fa4f08b21 Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev am: c0c3096100
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387475

Change-Id: I7f81b0c9cc2404082996f1a41fbe3db5db1b9d72
2021-04-30 22:21:48 +00:00
TreeHugger Robot e4c5b304e8 Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev am: b0a46baf90
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387477

Change-Id: Id0d4b81de3cb05934ef7470ac26287a84c2fb6f5
2021-04-30 22:21:24 +00:00
TreeHugger Robot 06c3c300b8 Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev am: dff30034b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387482

Change-Id: I919d99cf698746bb18510f5e45a16962392244b1
2021-04-30 22:21:15 +00:00
TreeHugger Robot 9b9f051c92 Merge "Adjust data types to prevent load of invalid value" into sc-dev 2021-04-30 22:07:16 +00:00
TreeHugger Robot 427912f659 Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev 2021-04-30 22:06:24 +00:00
TreeHugger Robot af61f20a8d Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev 2021-04-30 22:05:35 +00:00
TreeHugger Robot c0c3096100 Merge "Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot()." into sc-dev 2021-04-30 22:04:24 +00:00
TreeHugger Robot b0a46baf90 Merge "Prevent signed integer overflow in calc_qmfBufferReal()." into sc-dev 2021-04-30 22:04:04 +00:00
TreeHugger Robot dff30034b9 Merge "Prevent signed integer overflow in complex path of calc_qmfBuffer()." into sc-dev 2021-04-30 22:03:58 +00:00
Fraunhofer IIS FDK 5ba6f60265 Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483

Change-Id: If2e081e0eefc058afdbeb658de1d3eef0e877ee2
2021-04-30 19:14:08 +00:00
Fraunhofer IIS FDK 22e70729b4 Fix stack buffer overflow in Pred_lt4().
Bug: 186706541
Bug: 160187491
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I3b8d9326319cca21145cc246588b01c5bf29a9a0
2021-04-30 17:56:52 +00:00
Fraunhofer IIS FDK ef864daeea Prevent signed integer overflow in complex path of calc_qmfBuffer().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Iae0581ea983912bcf1bc6b3bdc2c0d8ee2f6248e
2021-04-30 15:38:00 +00:00
Fraunhofer IIS FDK 5522e52e5a Prevent signed integer overflow in calc_qmfBufferReal().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I6d12fba9d958280ead368fcc4c6c5c79dc0111e2
2021-04-30 15:29:59 +00:00
Fraunhofer IIS FDK 0e0a2f66d6 Revise synthesis QMF scaling for PS to avoid integer overflow in qmfSynPrototypeFirSlot().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I23ff345a1b1d0a8d125d49164fbd020387a37901
2021-04-30 15:26:58 +00:00
Fraunhofer IIS FDK a43c9f8822 Prevent undefined values for CODING_SCHEME type in huff_decode().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I82da4a5660289d1c96888d48c315f96a4a5c1c2a
2021-04-30 15:00:27 +00:00
Fraunhofer IIS FDK de5b6b5def Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value.
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibf8dbc1e61ff0453ac905efc88892d39c84fece6
2021-04-30 14:59:12 +00:00
Fraunhofer IIS FDK 68bb047e95 Avoid signed integer overflow in pcmLimiter_Apply(). am: 5a83a8e5e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14355877

Change-Id: Ic1ce11ac8b83e5dcf891239648dfc2979e6a8748
2021-04-30 14:58:15 +00:00
Fraunhofer IIS FDK 1f5fac767a Adjust data types to prevent load of invalid value
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
2021-04-30 14:44:19 +00:00
Fraunhofer IIS FDK d8515f231f Use dynamic scaling depending on autocorr length to avoid signed integer overflow.
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibc035ce2eafe4b0d98377d090adad77bbf5cbb5c
2021-04-29 19:13:22 +00:00
Fraunhofer IIS FDK 5a83a8e5e1 Avoid signed integer overflow in pcmLimiter_Apply().
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I89f5206053926cb2f8726e4bc1ffb9fc88371edb
2021-04-29 19:12:14 +00:00
Anuj Joshi e6f17b3e72 Stop using __DATE__/__TIME__ on all builds am: edbf93589b am: 5f80d21a8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670

Change-Id: I6fc207a9adab75841dbff7aa2bc0a33f6bee788e
2021-03-19 03:26:05 +00:00
Fraunhofer IIS FDK df2cddfdb3 Solve issue regarding config changes between Loudness-only vs. Loudness+DRC. am: a4695298d6 am: 830d2d033c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893669

Change-Id: I4241fc52c87b1d933813c22880166b7cf79fca1b
2021-03-19 03:26:03 +00:00
Fraunhofer IIS FDK 2475df28c2 Overcome SBR encoder coupling quality issue in ELD. am: edab3e30d6 am: 67bd65ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893668

Change-Id: I34cd4823c2a8af78710e32681385ea1be24515ca
2021-03-19 03:26:01 +00:00
Fraunhofer IIS FDK 9f6f300dff Fix input buffer flushing for PS encoder. am: 4fbc97cc47 am: 1e6b9e0283
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893667

Change-Id: If22aadf77a0c60c6e4f6dbb5b3bb5a5878c3a488
2021-03-19 03:25:59 +00:00
Fraunhofer IIS FDK fd82cc8924 Fix wrong input buffer feed for PS encoder at less input samples than framesize. am: bd021e7fb4 am: c66c41726b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893666

Change-Id: I0e37033545f624ae71bf20c9aef77b5585a7537b
2021-03-19 03:25:57 +00:00
Fraunhofer IIS FDK 4e95049d6e Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly. am: 0c2c08aef6 am: d3ade3d525
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893665

Change-Id: Id33b3066508311404c0149f9c7e539ffe952b303
2021-03-19 03:25:55 +00:00
Fraunhofer IIS FDK 648badf920 Consider TNS headroom for complex prediction. am: 5e031b67ba am: dd435f98de
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893584

Change-Id: I6d384642469e88979d18dd55cf61c566f6dde5b0
2021-03-19 03:25:53 +00:00
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
Anuj Joshi 5f80d21a8a Stop using __DATE__/__TIME__ on all builds am: edbf93589b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893670

Change-Id: Iaef3e0e1066e8e352b9ce3849bbce9fdc79d9d6d
2021-03-19 02:51:38 +00:00