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

1268 Commits

Author SHA1 Message Date
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
Fraunhofer IIS FDK d40cec83ed Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise(). am: ba54a5c040 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893570

Change-Id: I84f177df0aaa55929682b56a7bf2902c4f5fb9e7
 2021-03-19 02:50:57 +00:00
Fraunhofer IIS FDK 7f707f8057 Avoid integer overflow in dct_II(). am: 19c8cc495e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893569

Change-Id: I806a23071a940dbdb74d0e921c2b7312ae7c856b
 2021-03-19 02:50:55 +00:00
Fraunhofer IIS FDK a948ff1cd4 Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering(). am: 614b9f005a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893568

Change-Id: Ibcb7694e41a6836f5c46901cce534ea3d8813ab2
 2021-03-19 02:50:53 +00:00
Fraunhofer IIS FDK f04901b42a Adjust VBR mode depending on given peak bitrate and fix crash recovery usage. am: f89d1d0a4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13893567

Change-Id: I45a95e5562b8e7b8fef1e27d5e1aa28df1f1325f
 2021-03-19 02:50:51 +00:00
Xin Li 27a2f364cb [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ours am: 10a3289cdd -s ours am: c726622078 -s ours 
am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia59fdb0a73c7f0a6957d93b06ed59156a706aeed
 2021-02-20 16:40:18 +00:00
Xin Li c726622078 [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ours am: 10a3289cdd -s ours 
am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I351222fa379905cfb22d3d4a5c9022dda52a07cd
 2021-02-20 15:36:48 +00:00
Xin Li 10a3289cdd [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ours 
am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia658697341d335415b30e7c47015c78cbc308c34
 2021-02-20 14:53:59 +00:00
Xin Li 6d10f91a77 Mark ab/7061308 as merged in stage. 
Bug: 180401296
Merged-In: Id04d2590c249cad13da8dd8975d0a12ce96a9597
Change-Id: I4da99b78b01817308d8572d3c0d5b224b7d36a73
 2021-02-20 00:24:02 -08:00
Bob Badour 69179af1ee Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7 am: 2020366ce7 am: 24a33f559c 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b242f3f29aaba1a2b75deddf80c1caf967181b8
 2021-02-17 20:28:37 +00:00
Bob Badour 24a33f559c Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7 am: 2020366ce7 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I889815ab215531c3f2cd8a166c257ab9d00dbe8f
 2021-02-17 19:43:57 +00:00
Bob Badour 2020366ce7 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12c397ed7120bed1014941d0b1413d2bf9c29bb5
 2021-02-17 18:48:56 +00:00
Treehugger Robot 7fb40a5fbe Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f am: 80ccc5df59 am: 80ec04f39f 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23c603170477f2afaa2b0bf7c4718c89775beecf
 2021-02-17 18:22:12 +00:00
Bob Badour 7ad87e81d7 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37a9304f439a0ed700126de649a37378d03ce6bc
 2021-02-17 18:07:22 +00:00
Treehugger Robot 80ec04f39f Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f am: 80ccc5df59 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95a53a55339caf67184bb3c8fc8c562c634bb159
 2021-02-17 17:37:17 +00:00
Bob Badour 9f1be9d06f Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" 2021-02-17 17:32:45 +00:00
Treehugger Robot 80ccc5df59 Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27f 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5758ea2841ee0323b20459e0a2dabacd509c14ca
 2021-02-17 17:01:02 +00:00
Treehugger Robot b3ae2fd27f Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib28a2522296895dec1d6a5cc465a7427e19ab93a
 2021-02-17 16:22:30 +00:00
Treehugger Robot dde78303e8 Merge "Fix improper assignment in aac_enc_fuzzer" 2021-02-17 15:54:03 +00:00
Anuj Joshi b50bd1751d Fix improper assignment in aac_enc_fuzzer 
This commit updates the fuzzer to use correct value of
kSignalingModesSize and prevent OOB access on kSignalingModes

Test: ./aac_enc_fuzzer
Bug: 180220144

Change-Id: Ic9d01c5c166f2291d8d8ffacaa7813fb1560322b
 2021-02-17 17:01:03 +05:30
Fraunhofer IIS FDK ba54a5c040 Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() and adjustTimeSlotHQ_GainAndNoise(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: Ib630d56a626ddd59a9155df38cda2011c3165346
 2021-02-14 12:20:35 -08:00
Fraunhofer IIS FDK 19c8cc495e Avoid integer overflow in dct_II(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I6c30c4dec3f85410c2748eb42d38f5eb72521ec5
 2021-02-14 12:20:21 -08:00
Fraunhofer IIS FDK 614b9f005a Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering(). 
Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: Ic9217bbb3980807036ae6ae121e6ddb7cc1bce35
 2021-02-14 12:20:13 -08:00
Fraunhofer IIS FDK f89d1d0a4e 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
 2021-02-14 12:20:02 -08:00
Bob Badour 176eed73f1 [LSC] Add LOCAL_LICENSE_KINDS to external/aac 
Added SPDX-license-identifier-Apache-2.0 to:
  fuzzer/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I518bcad1cb91b80b2bcce1726f53aadf9afc749e
 2021-02-14 10:37:21 -08:00
Treehugger Robot dcf386247c Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689 am: 2ee2fa993b am: 8105418c36 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53a3f33a95b2ac0f654dac6452be1720ab36ccfa
 2021-02-14 05:22:34 +00:00
Treehugger Robot 8105418c36 Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689 am: 2ee2fa993b 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8283ef52ab3e1bfe2d15bb2181ff91d55f8887c7
 2021-02-14 04:55:15 +00:00
Treehugger Robot 2ee2fa993b Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a552820e12c26f42486d2c5be088b46c03e47b0
 2021-02-14 04:27:41 +00:00
Treehugger Robot 118aad7689 Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9e8b3426ba251349474e101fa5038172de4ad70
 2021-02-14 04:00:31 +00:00
Treehugger Robot fbed528d62 Merge "aac_enc_fuzzer: Improve code coverage" 2021-02-14 03:24:05 +00:00
Anuj Joshi d3c11e097b aac_enc_fuzzer: Improve code coverage 
Test: ./aac_enc_fuzzer
Bug: 172429950

Change-Id: Id8c5c6351627ba09d6b0f8eeb81ad81003eba0c5
 2021-02-01 10:30:22 +05:30
Cindy Zhou 0046a43b8b Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7 am: 8aa9b563bd 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a49851a5dbdb4487083d20661c7825378a11424
 2021-01-21 00:02:06 +00:00
Cindy Zhou 8aa9b563bd Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b976c7c29a345e632d25f2e6ac1c2e5ea631b9f
 2021-01-20 23:43:35 +00:00
Cindy Zhou 2b3a48d3b7 Merge "aac remove diag" am: f13c7a4054 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I228ca5c02b5284a17e96c2f09adc27848d364703
 2021-01-20 23:40:09 +00:00
Cindy Zhou f13c7a4054 Merge "aac remove diag" 2021-01-20 23:11:07 +00:00
Jean-Michel Trivi cc9b0a4702 Merge "Solve issue regarding config changes between Loudness-only vs. Loudness+DRC." 2021-01-19 16:41:26 +00:00
TreeHugger Robot a3e14fef36 Merge "Overcome SBR encoder coupling quality issue in ELD." 2021-01-18 17:36:37 +00:00
TreeHugger Robot a6f058fbac Merge "Fix input buffer flushing for PS encoder." 2021-01-18 17:36:32 +00:00
TreeHugger Robot 0af61b88ed Merge "Fix wrong input buffer feed for PS encoder at less input samples than framesize." 2021-01-18 17:36:28 +00:00
Fraunhofer IIS FDK 4204c46665 Overcome SBR encoder coupling quality issue in ELD. 
Bug 177604812
Test: see SBR/PS encoder

Change-Id: Ie7b9f8d1dec3708557d1e1189d45bc0e3bf5444c
 2021-01-14 17:33:03 -08:00
Fraunhofer IIS FDK 91ec65f7c8 Fix input buffer flushing for PS encoder. 
Bug 177604812
Test: see PS/SBR encoder

Change-Id: I3152bd7db5e039ecc54885e5b58c1cf6cb598b28
 2021-01-14 17:30:22 -08:00
Fraunhofer IIS FDK a7c36cc207 Fix wrong input buffer feed for PS encoder at less input samples than framesize. 
Bug 177604812
Test: see PS/SBR encoder

Change-Id: I08a20209bcb83784fda5c14584b6e99c65672545
 2021-01-14 17:28:11 -08:00
TreeHugger Robot d99aadd0d7 Merge "Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly." 2021-01-15 00:47:26 +00:00
TreeHugger Robot eb8e26e019 Merge "Fix USAC time domain limiter latency at config change." 2021-01-15 00:47:10 +00:00
TreeHugger Robot 8cc30d9c62 Merge "Consider TNS headroom for complex prediction." 2021-01-15 00:25:38 +00:00
Fraunhofer IIS FDK af0c91e7b8 Solve issue regarding config changes between Loudness-only vs. Loudness+DRC. 
Fix config changes from Loudness+DRC to Loudness-only configurations by clearing the DRC configuration

Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I7afef848308478c29a82b13f24ba8c2a9760fd45
 2021-01-14 15:41:58 -08:00
Fraunhofer IIS FDK 67cae74f74 Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly. 
Prevent error return during parsing of incomplete uniDrcGain() element. This fixes unnecessary concealment of frames for AAC in case a uniDrcGain() is provided, but the uniDrcConfig() element is not available.

Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I5ae343eaea481774c53240dbce4da0f4ff06cd1d
 2021-01-14 15:32:32 -08:00