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

1283 Commits

Author SHA1 Message Date
TreeHugger Robot 4080278410 Merge "Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering()." 2020-12-27 01:47:15 +00:00
Fraunhofer IIS FDK c8a38ef647 Adjust VBR mode depending on given peak bitrate and fix crash recovery usage. 
Operating the FDK encoder in A2DP with variable bitrate mode
configuration resulted in unexpected encoder return value AACENC_ENCODE_ERROR.

Due to peak bitrate restriction the encoder quite often runs into requantization.
In case the bitrate constraint is not fulfilled, the so-called crash recovery is
used as final emergency step. The crash recovery reduces the overall bit
consumption considering the given number of bits to be saved. The bit difference
is extracted from audio element structures. In VBR mode the element wise bit
consumption state was not updated since there is typically no bitrate limitation
required.

The patch solves the choppy audio problems and increases audio quality for
AAC VBR encoding.

The changes in FDKaacEnc_QCMain() ensure that audio element bit info is always
updated. This is achieved by always calling FDKaacEnc_BitResRedistribution()
and FDKaacEnc_prepareBitDistribution() with maxBitsPerFrame variable as total
bits parameter.
Furthermore, VBR assumes a certain target bitrate which is used for internal
configuration and limitations. In case the peak bitrate parameter is less than
the VBR mode target bitrate the maximum of both bitrate configurations was used.

The function FDKaacEnc_AdjustVBRBitrateMode() is added to adjust the encoder
internal VBR mode to a desired target bitrate less than given peak bitrate.
It is possible that the peak bitrate is very close to the desired target bitrate.
The virtual available bitreservoir is quite low and the encoder would run quite
often into requantization with needless audio quality reduction. In such a
configuration, it is a better choice to use the CBR targeted threshold adaption
to avoid audio quality reduction.

In FDKaacEnc_Initialize(), there was already a bitResMode selection depending
on available bitreservoir for CBR. This selection will now also be used for VBR.
In case the bitResMode is AACENC_BR_MODE_FULL and VBR mode is selected, the VBR
threshold adaption is used. Otherwise, CBR threshold adaption strategy is used
and therefore, no unnecessary fill bits are written.

Bug: 161400526
Test: see bug
Change-Id: I1865f817180150da6add2623a64f1a102622784a
 2020-12-23 18:57:54 -08:00
Fraunhofer IIS FDK 883c114399 Validate DRC compression factor and DRC boost factor value range in aacDecoder_SetParam(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I1d8534145bcf400c5da58d64d3b7e73a87cb43be
 2020-12-23 15:08:03 -08:00
Fraunhofer IIS FDK aad908c262 Prevent integer overflow in subbandTPApply() energy update. 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9ed8b33414907706808956cffad252052928c799
 2020-12-23 15:04:17 -08:00
Fraunhofer IIS FDK 4305167ceb Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: Ib630d56a626ddd59a9155df38cda2011c3165346
 2020-12-23 14:50:36 -08:00
Fraunhofer IIS FDK 2b281bb5a3 Avoid integer overflow in dct_II(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I6c30c4dec3f85410c2748eb42d38f5eb72521ec5
 2020-12-23 14:46:18 -08:00
Fraunhofer IIS FDK 9f9bffb763 Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: Ic9217bbb3980807036ae6ae121e6ddb7cc1bce35
 2020-12-23 14:45:11 -08:00
Cindy Zhou c93fff6784 Enable cfi for aac 
Bug: 158010610
Bug: 173497308
Test: ran atest DecoderConformanceTest, ImageReaderDecoderTest,
VideoDecoderPerfTest, VideoEncoderTest.  Compare the
before and after enabling CFI results since there was a number of tests
that were initially failing.

Change-Id: I0d0d2a76512dc909a67f34adacff9ffbf536dbe7
 2020-12-17 07:45:11 -08:00
Xin Li f4f79ae49c Mark ab/6881855 as merged am: b831187d3a am: a5f0e4af6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547

Change-Id: I9243e7da297d69b2bcb1f2d87a4b7a36c961e063
 2020-11-24 00:35:17 +00:00
Xin Li a5f0e4af6d Mark ab/6881855 as merged am: b831187d3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547

Change-Id: Id04d2590c249cad13da8dd8975d0a12ce96a9597
 2020-11-24 00:10:16 +00:00
Xin Li b831187d3a Mark ab/6881855 as merged 
Bug: 172690556
Change-Id: I4edc064b9a87da525672e61919ec8fb59a70202e
 2020-11-23 11:29:57 -08:00
Bill Yi 95d83d6c0d [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am: de35b0d3cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01e518ed4a6d04fd21c673bd6fbf7c6739d21320
 2020-11-05 04:57:08 +00:00
Bill Yi 54e05b6496 [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am: 700bc783fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77b49175f9c8523aa87b1aa4b99a106bdaef25b6
 2020-11-05 04:57:01 +00:00
Bill Yi de35b0d3cc [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -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: I9d8f11842a7d222ff9eaf50be2e44f1507c4bb49
 2020-11-05 04:21:11 +00:00
Bill Yi 700bc783fb [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -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: Ifc66ac802e4e6eec723e5e762cf94f107f5f7ba6
 2020-11-05 04:21:02 +00:00
Bill Yi dd90d1595f [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -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: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
 2020-11-05 04:01:22 +00:00
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