1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-16 03:12:14 +01:00

1216 Commits

Author SHA1 Message Date
android-build-team Robot
dcf27337e1 Snap for 5942013 from da5b0dcb3c01197b3499e0b569babcb0f5a09bbe to rvc-release
Change-Id: I84e4e06054e0d2c04fe64b23f963e056b8e72947
2019-10-16 03:05:53 +00:00
Fraunhofer IIS FDK
2152ae1a5e Suppress integer overflow in lsf_weight_2st() by using 64 bit multiplication with explicit 32 bit integer result.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I82ce4858688e90abee0c44c4ada34a9a7b08342f
2019-10-15 15:50:10 -07:00
Fraunhofer IIS FDK
3c377e3305 Prevent signed integer overflow in RE8_PPV().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic66ac4742d8e466431c5cf09d02b0d9c7f842df2
2019-10-15 15:49:37 -07:00
Fraunhofer IIS FDK
4db9f39f6d Avoid signed integer overflow in E_LPC_f_lsp_a_conversion().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: If2110ad246bb5b57ef76c9cd251874ecd4b05109
2019-10-15 15:49:23 -07:00
Fraunhofer IIS FDK
2d292e9b2d Use SATURATE_LEFT_SHIFT in get_lsppol() to prevent integer overflow.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie9ec52485a52b076a900b111b035289110c004f8
2019-10-15 15:49:00 -07:00
Fraunhofer IIS FDK
4c839c6a90 Fix integer overflow in E_UTIL_preemph().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iaaa0630e59d8e83e58b25168a3db04304485429b
2019-10-15 15:48:46 -07:00
Fraunhofer IIS FDK
1b4a3bedbb Overcome potential integer overflows in M/S module for complex prediction.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic0648203b6a61ebff8bcc93c4b1099e033bc6860
2019-10-15 15:48:32 -07:00
Fraunhofer IIS FDK
40d2a1d8b0 Avoid integer overflows with pseudoLR in CAacDecoder_DecodeFrame().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I5c83d72b5c0f4cd1569b648f102c8c549a7a6ac2
2019-10-15 15:47:53 -07:00
Fraunhofer IIS FDK
f0e1e3f8c7 Validate correct ascLen in CLatmDemux_ReadStreamMuxConfig() to overcome integer overflow in FDK_get32().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I87b53661df7a435ddf3572a0ff8b6ef84972db60
2019-10-15 15:47:17 -07:00
android-build-team Robot
b56a4ce3f7 Snap for 5939454 from b1b306443a1cc0308fa563b40a281bae53346d01 to rvc-release
Change-Id: I6dae09bcdf2319101d416e69dbd3b8a5cc97ac95
2019-10-15 03:11:12 +00:00
Fraunhofer IIS FDK
da5b0dcb3c Restrict size of huffman escape sequence to prevent shift with too large exponent in DecodeEscapeSequence().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ibcd182e313e9ef480e92619023bf424762b92e23
2019-10-14 15:19:19 -07:00
Fraunhofer IIS FDK
15965e3feb Limit too large shift exponent in CJointStereo_ApplyMS()
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia6ab654654e899368ba207a66eddf22b6b855635
2019-10-14 15:14:28 -07:00
Fraunhofer IIS FDK
6f98eab350 Saturate shift value in calculateSbrEnvelope(). Prevents too large shift values.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3331ac9bc267cd3fa4c1178bc445998869f0d99b
2019-10-14 15:08:34 -07:00
Fraunhofer IIS FDK
a65911cd2e Limit shift exponent in adjustTimeSlot_EldGrid().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I4000972d63d74e871d47f2db031308cd7ea285d6
2019-10-14 15:06:23 -07:00
Fraunhofer IIS FDK
bedfd82356 Fix shift value assignment in addHighBandPart().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I69457c1b551e33e3ee9ef39b457b0f83de2e370e
2019-10-14 15:01:17 -07:00
android-build-team Robot
b7cb239980 Snap for 5936682 from f26eb8af7c38047ad113072a6de38e069dc5cf3f to rvc-release
Change-Id: I5a7309c9ef4f186d05c08f072707ce3e2bf6a9b8
2019-10-12 23:07:54 +00:00
Fraunhofer IIS FDK
b1b306443a Replace obsolete SBR CRC with superior FDK CRC implementation. Fixes ELD SBR CRC decoding and prevents negative shift exponents in calcCRC().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0c40609975de5854560643f3ce2c9fecf5973f73
2019-10-11 10:14:53 -07:00
Fraunhofer IIS FDK
0be235952d Solve potential dereference of null pointers in factorCLD().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I27334567d1887755d62fadf2456fd5366869cbab
2019-10-11 10:05:36 -07:00
Fraunhofer IIS FDK
572f59359a Reject unsupported channel configuration / audio object type combinations.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I84bd355df0f690636c109695d8df64fa7bdcf63c
2019-10-11 10:00:20 -07:00
Fraunhofer IIS FDK
2b5217a953 Fix possible stack buffer overflow in mapIndexData().
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I160e7174f32dabe386fce1e9ec67d3c8cea60c78
2019-10-11 09:41:07 -07:00
Fraunhofer IIS FDK
f26eb8af7c Fix CpePersistentData memory leak.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iee5c93d61088bbda2328099ad20413adae3fa09b
2019-10-10 12:45:54 -07:00
Fraunhofer IIS FDK
128abf6b1a Validate aacSampleRate after applying ELD downscale factor. Avoid division by zero.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3f7ece9451121d40fab2c97571c695c1ac62bd00
2019-10-10 12:42:13 -07:00
Fraunhofer IIS FDK
dbfa1cd71b Fix assert in synchronization() for loas streams with multiple sub frames.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Icb7d4b0b00a17367c8ec762b112fbb25268d9f67
2019-10-10 12:37:21 -07:00
Fraunhofer IIS FDK
cc825aecf5 Restrict sampling rates parsed from bitstream to maximum of 96kHz.
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I2511a7cfcdf1bae57d17c02c93867ccc4f1ea693
2019-10-10 12:03:14 -07:00
android-build-team Robot
1ceab98d55 Snap for 5864382 from 17bc55672e5cd439c590ee1096ff5fa904aea360 to rvc-release
Change-Id: I1813c2a55faf4d56dac4671182c7f040fad50a4c
2019-09-10 03:14:31 +00:00
Xin Li
17bc55672e [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f -s ours am: 7fc6e3f8ff -s ours
am: 99e78ac95f -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I1b0e74e7c405aa4e9b9841cc9ad931561ab5df56
2019-09-08 16:10:34 -07:00
Xin Li
99e78ac95f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f -s ours
am: 7fc6e3f8ff -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
2019-09-08 15:49:32 -07:00
Xin Li
7fc6e3f8ff [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 09dc9b073f -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
2019-09-08 15:06:57 -07:00
Xin Li
09dc9b073f Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
No content change.

Bug: 135460123
Change-Id: I058d0d709bb7752aa276e0047d2e0b81403ee5fc
Merged-In: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
2019-09-08 12:43:24 -07:00
android-build-team Robot
843b536574 Snap for 5860386 from 710de1d4dbb96dc6e513fd5a20c5433946e670e3 to rvc-release
Change-Id: Iafff7feea21247c065ee00282e6215c2aa14be1e
2019-09-07 23:19:31 +00:00
Xin Li
710de1d4db [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours am: 5d3d55e2c7 am: 35b1ada3b4
am: c7d03309f9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfc869a47e6e34a425709bf45e2c9d37af633db8
2019-09-05 12:25:32 -07:00
Xin Li
c7d03309f9 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours am: 5d3d55e2c7
am: 35b1ada3b4

Change-Id: I735bbaf8236207a00fb745c8e57a04c77b76b432
2019-09-05 12:09:13 -07:00
Xin Li
35b1ada3b4 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours
am: 5d3d55e2c7

Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
2019-09-05 11:50:22 -07:00
Xin Li
5d3d55e2c7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: d929f68a05 -s ours
am skip reason: subject contains skip directive

Change-Id: Iabc2e26ef91b10d03f213fa1a694cb921ca4c1bb
2019-09-05 11:26:33 -07:00
Xin Li
d929f68a05 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:26 +00:00
Xin Li
a209adb315 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
2019-09-04 13:33:32 -07:00
android-build-team Robot
a2c5c2a3da Snap for 5716344 from 092cd5352de1732a947ec312893e89720625bc94 to rvc-release
Change-Id: I28d54ed952190394138ba5158cd2701baeba753f
2019-07-10 03:05:43 +00:00
Xin Li
092cd5352d [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am: bf68b4972f
am: a3f72d9e44 -s ours
am skip reason: subject contains skip directive

Change-Id: I89cb15471dea474be46354bae3f04b39430e7355
2019-07-09 17:47:57 -07:00
Xin Li
a3f72d9e44 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours
am: bf68b4972f

Change-Id: I05880e6e76d61b683b55364726e841097f130a16
2019-07-09 17:20:13 -07:00
Xin Li
c6a0d0f4c2 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am: 50d8447d97
am: 2480568f89 -s ours
am skip reason: subject contains skip directive

Change-Id: I78e6e4e8878c1b48c2dbeb2fdc48f48e7926e9a3
2019-07-09 17:13:18 -07:00
Xin Li
2480568f89 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours
am: 50d8447d97

Change-Id: Ifb01dd1cbab4f450563f31f93c19dad5bf079404
2019-07-09 16:48:26 -07:00
Xin Li
bf68b4972f [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours
am: 6266103519 -s ours
am skip reason: subject contains skip directive

Change-Id: I69945c03e154530e7d917f1de7f0669480715686
2019-07-09 16:14:17 -07:00
Xin Li
50d8447d97 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours
am: 506ae97bee -s ours
am skip reason: subject contains skip directive

Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
2019-07-09 15:53:24 -07:00
Xin Li
6266103519 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am: c2eb64586d -s ours
am skip reason: subject contains skip directive

Change-Id: I637c44703fdee4aff09ea97fe2dce5c8395a2c63
2019-07-09 15:47:27 -07:00
Xin Li
506ae97bee [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: 569027011c -s ours
am skip reason: subject contains skip directive

Change-Id: I5aecc5cecde457bbfa6a076c68bd0b14bfa5da3f
2019-07-09 15:08:22 -07:00
Xin Li
c2eb64586d Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-09 21:38:48 +00:00
Xin Li
569027011c DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: Ibab15539f2fd0081ef9f8e1a607461d5238c9a88
2019-07-09 11:23:51 -07:00
android-build-team Robot
617c38c8cf Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to pi-platform-release
Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
2019-07-08 23:21:02 +00:00
android-build-team Robot
8fb74e1cef Snap for 5706589 from 916e0784d6429eb89ee503c4589b04cf76b61675 to rvc-release
Change-Id: Ic515243b6eed19ff54d962aa5c01697605a9f10a
2019-07-04 03:15:27 +00:00
Xin Li
916e0784d6 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 4d56b880e2
am: 0942f837c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia49c4c0c1b61b95d4393f7312189c237d86e5ea2
2019-07-02 15:25:32 -07:00