Commit Graph

990 Commits

Author SHA1 Message Date
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
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
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
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
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 81b3f63562 to pi-platform-release
Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
2019-07-08 23:21:02 +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
Xin Li 0942f837c5 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 4d56b880e2

Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8
2019-07-02 12:40:22 -07:00
Xin Li 4d56b880e2 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
2019-07-01 20:59:18 +00:00
Xin Li 622fc42193 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am: 058d1295f4
am: a55b37a564 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib2fd42b4ea1dcc8a0dbe897458ad489144b8b35a
2019-06-10 14:10:10 -07:00
The Android Open Source Project b4d8ae6576 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours am: f8d9637d81
am: 4e18d84cae -s ours
am skip reason: subject contains skip directive

Change-Id: I0594ed8210488ccdb7d0b4a20b886a1cb744efc7
2019-06-10 13:43:28 -07:00
Xin Li a55b37a564 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours
am: 058d1295f4

Change-Id: Icf8cfab1834934bd73b2d7cefdfcffc3ac225dc6
2019-06-10 13:38:20 -07:00
The Android Open Source Project 4e18d84cae [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours
am: f8d9637d81

Change-Id: Iba3e60f6fb4670f7f97159c42fc3ff366817a3b1
2019-06-10 13:29:39 -07:00
Xin Li 058d1295f4 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: b018de371d -s ours
am: c10b5daa8d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia1d6cf99beb6ee823b4e188c59025139db431f02
2019-06-10 13:27:49 -07:00
The Android Open Source Project f8d9637d81 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c3dcb81334 -s ours
am: e52d79c58e -s ours
am skip reason: subject contains skip directive

Change-Id: I68fb72ac2812bd9499eca63c16ddd4e02f483506
2019-06-10 13:17:27 -07:00
Xin Li c10b5daa8d [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
am: b018de371d -s ours
am skip reason: subject contains skip directive

Change-Id: Iacff6609b76e136716228b61a989a4a81b051c4f
2019-06-10 13:16:42 -07:00
The Android Open Source Project e52d79c58e [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
am: c3dcb81334 -s ours
am skip reason: subject contains skip directive

Change-Id: I92a43f949f1ca6b2d060c3bd8b5edf097b7db637
2019-06-10 13:05:55 -07:00
Xin Li b018de371d Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:59 +00:00
The Android Open Source Project c3dcb81334 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug: 134605042
Change-Id: Ife6e13bfe9017388e48143e2f6475111d5bebca3
2019-06-10 09:32:24 -07:00
Xin Li 22344b4b51 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am: 68078adb95
am: e8095d4d8e -s ours
am skip reason: subject contains skip directive

Change-Id: Idc89c0aef321103bb42fbe7297f91155019255e0
2019-06-05 20:38:29 -07:00
Xin Li e8095d4d8e [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours
am: 68078adb95

Change-Id: If38052df38ec81ce9e488ab9a58bc61724f2e664
2019-06-05 17:34:37 -07:00
Xin Li 68078adb95 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
am: 0ef4321d83 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e301b33d28f4a84f2cc584751315fa994628732
2019-06-05 17:06:41 -07:00
Xin Li 0ef4321d83 DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
Bug: 134605042
Change-Id: I5741210a2732e88685d878a5eb96d381924fa8d3
2019-06-05 15:18:18 -07:00
android-build-team Robot 87820b2475 Snap for 5524043 from 6c72374eea to pi-platform-release
Change-Id: Ibe2a6ddf5f388db0403be3d99676aa0384d4094c
2019-06-05 01:53:51 +00:00