aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ↵Xin Li2021-02-200-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s oursXin Li2021-02-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: Id04d2590c249cad13da8dd8975d0a12ce96a9597 Change-Id: I4da99b78b01817308d8572d3c0d5b224b7d36a73
* | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: ↵Bob Badour2021-02-172-0/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ad87e81d7 am: 2020366ce7 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I889815ab215531c3f2cd8a166c257ab9d00dbe8f
| * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: ↵Bob Badour2021-02-172-0/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ad87e81d7 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12c397ed7120bed1014941d0b1413d2bf9c29bb5
| | * | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06fBob Badour2021-02-172-0/+42
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I37a9304f439a0ed700126de649a37378d03ce6bc
| | | * \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac"Bob Badour2021-02-172-0/+42
| | | |\ \ \
| | | | * | | [LSC] Add LOCAL_LICENSE_KINDS to external/aacBob Badour2021-02-142-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: ↵Treehugger Robot2021-02-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3ae2fd27f am: 80ccc5df59 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95a53a55339caf67184bb3c8fc8c562c634bb159
| * | | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27fTreehugger Robot2021-02-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5758ea2841ee0323b20459e0a2dabacd509c14ca
| | * | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8Treehugger Robot2021-02-171-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1592151 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib28a2522296895dec1d6a5cc465a7427e19ab93a
| | | * | | | Merge "Fix improper assignment in aac_enc_fuzzer"Treehugger Robot2021-02-171-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix improper assignment in aac_enc_fuzzerAnuj Joshi2021-02-171-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689 ↵Treehugger Robot2021-02-143-52/+174
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2ee2fa993b Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8283ef52ab3e1bfe2d15bb2181ff91d55f8887c7
| * | | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689Treehugger Robot2021-02-143-52/+174
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a552820e12c26f42486d2c5be088b46c03e47b0
| | * | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62Treehugger Robot2021-02-143-52/+174
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1566866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9e8b3426ba251349474e101fa5038172de4ad70
| | | * | | Merge "aac_enc_fuzzer: Improve code coverage"Treehugger Robot2021-02-143-52/+174
| | | |\ \ \
| | | | * | | aac_enc_fuzzer: Improve code coverageAnuj Joshi2021-02-013-52/+174
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_enc_fuzzer Bug: 172429950 Change-Id: Id8c5c6351627ba09d6b0f8eeb81ad81003eba0c5
* | | | | | Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7 am: 8aa9b563bdCindy Zhou2021-01-211-7/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a49851a5dbdb4487083d20661c7825378a11424
| * | | | | Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7Cindy Zhou2021-01-201-7/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b976c7c29a345e632d25f2e6ac1c2e5ea631b9f
| | * | | | Merge "aac remove diag" am: f13c7a4054Cindy Zhou2021-01-201-7/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I228ca5c02b5284a17e96c2f09adc27848d364703
| | | * | | Merge "aac remove diag"Cindy Zhou2021-01-201-7/+0
| | | |\ \ \
| | | | * | | aac remove diagCindy Zhou2021-01-131-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing diag mode since it's only required for debugging purposes. Bug: 158010610 Test: n/a Change-Id: I597880ef5b63d12d2971237d02406faceda7e623
* | | | | | | Merge "Solve issue regarding config changes between Loudness-only vs. ↵Jean-Michel Trivi2021-01-192-4/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Loudness+DRC."
| * | | | | | | Solve issue regarding config changes between Loudness-only vs. Loudness+DRC.Fraunhofer IIS FDK2021-01-142-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Overcome SBR encoder coupling quality issue in ELD."TreeHugger Robot2021-01-182-10/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Overcome SBR encoder coupling quality issue in ELD.Fraunhofer IIS FDK2021-01-142-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 177604812 Test: see SBR/PS encoder Change-Id: Ie7b9f8d1dec3708557d1e1189d45bc0e3bf5444c
* | | | | | | | | Merge "Fix input buffer flushing for PS encoder."TreeHugger Robot2021-01-181-5/+6
|\| | | | | | | |
| * | | | | | | | Fix input buffer flushing for PS encoder.Fraunhofer IIS FDK2021-01-141-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 177604812 Test: see PS/SBR encoder Change-Id: I3152bd7db5e039ecc54885e5b58c1cf6cb598b28
* | | | | | | | | Merge "Fix wrong input buffer feed for PS encoder at less input samples than ↵TreeHugger Robot2021-01-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framesize."
| * | | | | | | | Fix wrong input buffer feed for PS encoder at less input samples than framesize.Fraunhofer IIS FDK2021-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 177604812 Test: see PS/SBR encoder Change-Id: I08a20209bcb83784fda5c14584b6e99c65672545
* | | | | | | | | Merge "Read uniDrcGainExtension element only if all DRC gain sequences are ↵TreeHugger Robot2021-01-151-5/+8
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | parsed correctly."
| * | | | | | | | Read uniDrcGainExtension element only if all DRC gain sequences are parsed ↵Fraunhofer IIS FDK2021-01-141-5/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Fix USAC time domain limiter latency at config change."TreeHugger Robot2021-01-155-141/+156
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix USAC time domain limiter latency at config change.Fraunhofer IIS FDK2021-01-145-141/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have observed quality problems regarding config switching for USAC streams. Crossfading did not consider the USAC time domain limiter latency correctly. The limiter memory still contained the last part of the frame before the config change. With this patch we were able to improve the quality by moving the limiter processing to the end of the processing chain (crossfade -> DRC -> limiter). By that we don't have to consider the limiter latency at the crossfader anymore and can resolve the quality issue. Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I0dfd3b76ff2b0daf495ad406283f56a39982ad8f Change-Id: I26f5da65ef8344602007e180e837820c6a25f173
* | | | | | | | | Merge "Consider TNS headroom for complex prediction."TreeHugger Robot2021-01-151-2/+4
|\| | | | | | | | | |/ / / / / / / |/| | | | | | |
| * | | | | | | Consider TNS headroom for complex prediction.Fraunhofer IIS FDK2021-01-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 176246647 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I8261106b98d7e7c5a8a2af38585c726285ea8623
* | | | | | | | Merge "Added aac_enc_fuzzer" am: 093573a634 am: a85ab74b62 am: c46a377538Kris Alder2021-01-133-9/+484
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1527719 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib842fadf4278b74faa59e83ef8401b154ec487d0
| * | | | | | | Merge "Added aac_enc_fuzzer" am: 093573a634 am: a85ab74b62Kris Alder2021-01-133-9/+484
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1527719 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If878046841ee4408530b47a76cb829b8b2c3c80a
| | * | | | | | Merge "Added aac_enc_fuzzer" am: 093573a634Kris Alder2021-01-133-9/+484
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1527719 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3295eaed1814e256668526f4ea9c41743dd4431
| | | * | | | | Merge "Added aac_enc_fuzzer"Kris Alder2021-01-133-9/+484
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Added aac_enc_fuzzerAnuj Joshi2020-12-283-9/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_enc_fuzzer Bug: 172429950 Change-Id: Ia84f85425f6df10b13a3d045472f7f684f27eb8a
* | | | | | | | Merge "Enable cfi for aac" am: 5690f9c39f am: 738df3d018 am: 524e89257cCindy Zhou2021-01-081-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa9c52a5ca9ddc6ca5edc35166afdc4a1f5b5788
| * | | | | | | Merge "Enable cfi for aac" am: 5690f9c39f am: 738df3d018Cindy Zhou2021-01-081-2/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5d834ad315cad4006cb839776dd03d795fdc27e
| | * | | | | | Merge "Enable cfi for aac" am: 5690f9c39fCindy Zhou2021-01-081-2/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b4ff4c9a2e1ccd1139a37ac2a537467efee9583
| | | * | | | | Merge "Enable cfi for aac"Cindy Zhou2021-01-081-2/+8
| | | |\ \ \ \ \
| | | | * | | | | Enable cfi for aacCindy Zhou2020-12-171-2/+8
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | / / / Merge "Adjust VBR mode depending on given peak bitrate and fix crash ↵Treehugger Robot2021-01-080-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery usage." am: 5d8224586c am: 3152997588 am: a108a6cafa Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1542709 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53fc9b09bc32fef1563294c1a6277fd599952cc3
| * | | | | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash ↵Treehugger Robot2021-01-084-36/+83
| |\| | | | | | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery usage." am: 5d8224586c am: 3152997588 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1542709 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id89e1389e52aaf7ed338f7cf431ed5e9d1fba9f8
| | * | | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash ↵Treehugger Robot2021-01-084-36/+83
| | |\| | | | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery usage." am: 5d8224586c Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1542709 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I676c98594c21af87992da5e4286d8c83f6a11098
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 07:00:29 +0000