fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,367 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

1367 Commits

Author SHA1 Message Date
Bill Yi 51ff3aa199 [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours 
am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978

Change-Id: Ia3fae7d8939333684ff3ea15081ac69624d58873
 2020-11-05 04:01:14 +00:00
Bill Yi 0834f1a0b8 Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f4adff7fbb 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978

Change-Id: Ied811f647e67defe1286b9a8e4a0bdc2c89da3c2
 2020-11-05 03:01:21 +00:00
Bill Yi 8b4e287ff6 Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978

Change-Id: Ifc71d75171dfbc250f59774aea3ddb950e70d356
 2020-11-05 03:01:13 +00:00
Bill Yi f4adff7fbb Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" 2020-11-05 01:06:54 +00:00
Bill Yi 5b4265a02a Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE 
Merged-In: I44e842648acbceb02bbc28cf2ad729a0caddf60d
Change-Id: Iead5cf2ca1c993da0844a11d1e64bf3cc86ed5dd
 2020-11-04 13:57:54 -08:00
Bill Yi ac5e8684ad [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am: 092c1fb7fb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835

Change-Id: I8fc1c1761320ee974541e04597bba6d4f795575b
 2020-11-04 19:24:27 +00:00
Bill Yi 092c1fb7fb [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours 
am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835

Change-Id: Ib5460d11c6484d4794e75fcd4c9ba48a4b57a472
 2020-11-04 19:06:22 +00:00
Bill Yi 1f2e0ecb62 [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 4c3407e563 -s ours 
am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835

Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
 2020-11-04 18:34:36 +00:00
Bill Yi 4c3407e563 Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d
Change-Id: I462d697908f9803317f038c916d5942967efa28a
 2020-11-03 22:27:17 -08:00
Xin Li 2dda9ea1e0 [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s ours am: aacea3ffc5 -s ours am: c0e0f2885b -s ours 
am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744

Change-Id: I70d88a980024111702d47c78401560d02fc5569c
 2020-10-09 03:25:21 +00:00
Xin Li c0e0f2885b [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s ours am: aacea3ffc5 -s ours 
am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744

Change-Id: Ideafc491bc2347878d68eb5c50389169382cc35c
 2020-10-09 02:35:07 +00:00
Xin Li aacea3ffc5 [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s ours 
am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744

Change-Id: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d
 2020-10-09 02:10:07 +00:00
Xin Li f473247482 Skip ab/6749736 in stage. 
Merged-In: Icfe1613791fb53502d99e3030dd9e9baa3fa5c33
Change-Id: I7d1c753bfa3343d5931058143dc016c3a0861700
 2020-10-08 16:52:22 -07:00
Jean-Michel Trivi f451278f0e Fix fuzzer's use of aacDecoder_DecodeFrame 
The aacDecoder_DecodeFrame function takes a size in numbers of
samples (INT_PCM), not a number of bytes. Using a number of
bytes caused the FDK to believe the array was larger than it
really was. Therefore on invalid frames, it would try to
clear a size larger than was really available, causing an OOB
crash.

Bug: 161014225
Test: check clusterfuzz results for case 6217304556437504
Change-Id: I9278898a17c1c961c568e841c6037d0c14bcc8b4
 2020-10-05 16:27:56 -07:00
android-build-team Robot 0e9a1509b5 Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release 
Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
 2020-09-16 23:30:07 +00:00
Fraunhofer IIS FDK ffff95538e Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). 
In the bug the SBR decoder has already set up 9 channels and tries to
allocate one more channel. The assignment of the QMF channels to SBR
channels fails since the QMF domain manages only 8+1 channels instead
of 10 channels as reqeusted by SBR.
Here we have added a check in sbrDecoder_InitElement() which will
return with a parse error in case additional SBR channels would exceed
the maximum number of SBR channels. This solves the potential heap
buffer overflow.

Bug: 158762825
Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac
Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
(cherry picked from commit bb8f983bf3)
 2020-09-16 23:28:22 +00:00
Fraunhofer IIS FDK 6c00295b87 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: 4a089e4bd9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I6a0b672cc2b78f76468a3a7d752b22483acf71bb
 2020-09-16 05:39:37 +00:00
Fraunhofer IIS FDK fc93600c47 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: f23ab25e7a -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: Idff3c3ad45b84cdf6bd589c3ff209351f5faa1c5
 2020-09-16 04:24:09 +00:00
Fraunhofer IIS FDK cd096ddf25 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f142fe0030 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: If1dd497db61fd61d2cd5bddefdfcf182c080e349
 2020-09-16 03:14:23 +00:00
Ray Essick 7093622d49 point to new repo hooks for mainline uploads am: ebc1030f65 am: 3f829aa0e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/11606191

Change-Id: I991dd4b78a602f40454953f01c60cc2503d44ca6
 2020-09-16 02:27:34 +00:00
Jooyung Han 47fc6e8cce [automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: fbd4db0365 -s ours 
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/11263335

Change-Id: I892b374b00f561eff41b89738ff567133532c6cd
 2020-09-12 21:49:43 +00:00
Xin Li 7dc94b2dfa [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours am: ec717def34 -s ours am: a222880e9b -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: Idea157a42c7031cfa30de0dd3b1f50dac3b46583
 2020-09-11 21:27:44 +00:00
Xin Li a222880e9b [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours am: ec717def34 -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I33abaa1c2d16e2b0b93b33e942c1e315fd1f29aa
 2020-09-11 03:59:15 +00:00
Xin Li ec717def34 [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I5b8161f44651f40c168a81ba535e8c26ad5b533e
 2020-09-11 03:33:44 +00:00
Xin Li c0dbde6b33 [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I1713993ae0e8fb75c4e27fdad6c8e263b7391a03
 2020-09-11 02:02:53 +00:00
Xin Li 26a0396347 [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I6d537ca8862ea4f0409b2f173ab9d7e9cafc70ae
 2020-09-11 00:40:34 +00:00
Xin Li 89b6626d5d Merge "Merge Android R" 2020-09-10 17:22:12 +00:00
Fraunhofer IIS FDK 7d2846db64 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 8ad12f29d8 am: 543db9d0bd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I50eb5d1c4120b07134e8bb6545f3fb216086d698
 2020-09-10 00:24:52 +00:00
Fraunhofer IIS FDK 9126bcf255 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: 846f899a2f am: 7b0e1e7056 am: 098059f5bb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I7101bae5b44c3deb50dfcbbd64e0497988f88ed2
 2020-09-10 00:24:46 +00:00
Fraunhofer IIS FDK a79160d8b9 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: e82257ae36 -s ours am: 1935ab0459 -s ours am: fd762222af -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: Ibcf8647e8894d69df1849dd3321793824798afb6
 2020-09-10 00:24:40 +00:00
Fraunhofer IIS FDK ca8e2c784a [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 421e4c1cdf am: 52ee4c21d8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I29f1e1a0fec0e1b6d7e843dae3a2494ec63f247e
 2020-09-10 00:24:25 +00:00
Fraunhofer IIS FDK 5e92535feb [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: eb737fb95b -s ours am: 8e26f8d6b3 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: Idcc12077b6919f21a6b709cff952a098c650ec43
 2020-09-10 00:23:48 +00:00
Fraunhofer IIS FDK db025b5612 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: 9474f4eb44 -s ours am: 8a856643ac -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I5e73d47e6d8b791f7b6ec4fa34a120ed72733708
 2020-09-10 00:21:39 +00:00
Fraunhofer IIS FDK 543db9d0bd [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 8ad12f29d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Iefa0bc6d2f856953743b58518ce85ecc9d268428
 2020-09-10 00:00:19 +00:00
Fraunhofer IIS FDK 098059f5bb [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: 846f899a2f am: 7b0e1e7056 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I6c6b66c316ec178db6d1e17712c07fe7819c9a10
 2020-09-09 23:58:02 +00:00
Fraunhofer IIS FDK fd762222af [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: e82257ae36 -s ours am: 1935ab0459 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I040218276ea001057c4caf0174917b6d4019a77b
 2020-09-09 23:57:55 +00:00
Fraunhofer IIS FDK 7b0e1e7056 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: 846f899a2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I26b07435bd9342cc5d03ab1b592a9c2327e200c2
 2020-09-09 23:57:28 +00:00
Fraunhofer IIS FDK 52ee4c21d8 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 am: 421e4c1cdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I1bc389e9d78adac54555747734eb944ce4252e02
 2020-09-09 23:57:27 +00:00
Fraunhofer IIS FDK 1935ab0459 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: e82257ae36 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: If77ba60c209bf8f0eab292b75cd5c6d5ec82ac3b
 2020-09-09 23:57:15 +00:00
Fraunhofer IIS FDK 8e26f8d6b3 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: eb737fb95b -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I11fbcafea541a3a8cea729f0b6e76b905998ccfb
 2020-09-09 23:57:01 +00:00
Fraunhofer IIS FDK 8a856643ac [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: 9474f4eb44 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I6089f72bd3a957d4ba782a933d9f28802d5d2978
 2020-09-09 23:56:13 +00:00
Fraunhofer IIS FDK 8ad12f29d8 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I8235c710a39639720ca3a52f6a0c84f3cbc6fe5f
 2020-09-09 23:25:20 +00:00
Fraunhofer IIS FDK 421e4c1cdf [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I2466f0be7926e6f135d774f0289198af18753804
 2020-09-09 23:25:20 +00:00
Fraunhofer IIS FDK eb737fb95b [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I92f87237ef6f4a0b9a21801e738378d550e98465
 2020-09-09 23:25:12 +00:00
Fraunhofer IIS FDK 9474f4eb44 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: Ie76449e6f28f51989ed628d4f996992147e72621
 2020-09-09 23:25:11 +00:00
Fraunhofer IIS FDK 4a089e4bd9 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Ibf754e4252ff637e5f8c0ee5073411b33f4af322
 2020-09-09 23:17:47 +00:00
Fraunhofer IIS FDK f23ab25e7a [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I3b6f0708a5aedd7307ee2ebec7d56eca5b169818
 2020-09-09 23:17:41 +00:00
Fraunhofer IIS FDK 846f899a2f [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Icfcbfe06d528323ba83366db8bae197082329037
 2020-09-09 23:17:24 +00:00
Fraunhofer IIS FDK e82257ae36 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I26b8dd96bf69eadd2fbee7487516667598ba546a
 2020-09-09 23:17:18 +00:00
Fraunhofer IIS FDK aa6329fb90 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Idd4c6d188cc413f82b83b02ceee852d432a1e827
 2020-09-09 23:16:47 +00:00