fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-02 00:46:43 +01:00
Code Issues Projects Releases Wiki Activity
1,418 Commits 10 Branches 11 Tags 9.6 MiB
Commit Graph

1418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
e72924914c [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: I58f79bbd56888233a5d4e80f55db0c12fd4245e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:01:19 +00:00
Fraunhofer IIS FDK
f02e2ba58f [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: Ieacfcbb28bd8f356162a8d3cc92a350a2d03f0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:26:13 +00:00
Fraunhofer IIS FDK
4942ddcaac [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: I34e3e3c3d56c7ad92d0619abcc160f77c0487dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:01:33 +00:00
Fraunhofer IIS FDK
8b6f2f0af5 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: I46baa1df38066d55b0c8ba13de4a8587e189f788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:38:42 +00:00
Fraunhofer IIS FDK
8c56a3bf71 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: Ife0ac184822af69a6640cc0a01783259b290679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:14:49 +00:00
Fraunhofer IIS FDK
b5b3b3c0a2 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 0ad5135377 -s ours am: d5de58e395 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: Ib9306e120fc4117ea18f0c8a6039ca461df5acb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:18:22 +00:00
Fraunhofer IIS FDK
16585e6174 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

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

Change-Id: Ia1d76d35fde1175b5bcda3669b1c8b0fe76a717d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:17:22 +00:00
Fraunhofer IIS FDK
d5de58e395 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 0ad5135377 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: Id687212c011e695880d23974f25080452c4cf002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:11:06 +00:00
Fraunhofer IIS FDK
88d1e82df9 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 29f4827ef4 -s ours am: 9bfb60d7c4 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

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

Change-Id: I3be6917066813802035854bcb6a744dc57d4984c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:43 +00:00
Fraunhofer IIS FDK
70ac549da3 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours am: f57a7c233f -s ours am: 96eb73f1d2 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history

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

Change-Id: Iee254145cc580a97f8ac5ca7de149f87f332b916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:37 +00:00
Fraunhofer IIS FDK
5a05a6a816 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: c650c88c62 -s ours am: 76075bd4e5 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 2768a078f3 is already in history

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

Change-Id: I08268a900f00d5f72a27843f71cac70fcdba8838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:09:18 +00:00
Fraunhofer IIS FDK
0ad5135377 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: If518b274a207500bc53d1a7566d76339e3afcbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:55:59 +00:00
Fraunhofer IIS FDK
2b57d2b0be Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048

Change-Id: I483ed144764b68840a5ee6463f1db927fe174ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:55:14 +00:00
Fraunhofer IIS FDK
9bfb60d7c4 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 29f4827ef4 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

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

Change-Id: I8d5ee3895733fa660cc096ee7cbf3f3ccdb2ff9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:49:06 +00:00
Fraunhofer IIS FDK
96eb73f1d2 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours am: f57a7c233f -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history

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

Change-Id: I780c0ef89eff586ba5ad462d25527d5e1502c38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:49:00 +00:00
Fraunhofer IIS FDK
76075bd4e5 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: c650c88c62 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 2768a078f3 is already in history

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

Change-Id: I188c5da3f9b47d51a2fc8bca78ad9c33a612359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:56 +00:00
Fraunhofer IIS FDK
f95792e18c [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: I5888c51c770184ab3349f3e0c90eeccb19f5f47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:38 +00:00
Fraunhofer IIS FDK
29f4827ef4 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

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

Change-Id: I6fed7db61ffe312199e9761be800dff1fbd80a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:35 +00:00
Fraunhofer IIS FDK
f57a7c233f [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history

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

Change-Id: I59120641fbf79d13ad4886c224e9fc90b71ca87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:31 +00:00
Fraunhofer IIS FDK
6b001a123c [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

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

Change-Id: I5f682fc32640b62e99c3d27a52a707084f4d9699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:29 +00:00
Fraunhofer IIS FDK
156794b105 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: Ie0df904e14408f20118d07e9d416c27b52d2f908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:18 +00:00
Fraunhofer IIS FDK
23ef1ac38c Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:05:39 +00:00
Fraunhofer IIS FDK
b297bcbf2a Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:04:55 +00:00
Fraunhofer IIS FDK
d787bdd639 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615051

Bug: 224314979
Bug: 221734266
Change-Id: Id377e9ed3e293572c9f6feadbabdaa7ac66e0a6e
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:54 +00:00
Fraunhofer IIS FDK
2768a078f3 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:47 +00:00
Fraunhofer IIS FDK
c650c88c62 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:01 +00:00
Fraunhofer IIS FDK
6a3817573b Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:43:17 +00:00
Fraunhofer IIS FDK
eb07c22519 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:42:12 +00:00
Treehugger Robot
891e8c1f3a Merge "Add license_note" am: 3070cab376 am: 53c773b1ce 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: I264e8378920565bcaa08d057cbd262e1260a5a6f
 2022-03-08 17:02:32 +00:00
Treehugger Robot
53c773b1ce Merge "Add license_note" am: 3070cab376 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: I21f518a6f6617cb68c06fc131e38ac3c0991f28a
 2022-03-08 16:34:15 +00:00
Treehugger Robot
3070cab376 Merge "Add license_note" 2022-03-08 16:12:37 +00:00
Bob Badour
d468889147 Add license_note 
Comments not preserved during refresh.

Bug: 68860345

Test: m nothing
Change-Id: I46129df85a9242587621756be25d797bf90428d6
 2022-03-07 14:26:02 -08:00
Etienne Ruffieux
19f5de8354 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 am: acbcc9b9f3 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: Iff49e44b95b4c812cfedfe4de438fa081d8dc534
 2021-12-16 23:13:53 +00:00
Etienne Ruffieux
acbcc9b9f3 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: I8f89b5cf299b92478fdeea4df43dcd1544ec4a6d
 2021-12-16 22:44:25 +00:00
Etienne Ruffieux
19aed5ca32 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: I86050beb93e24fa9fda8ad977b39429a1739316a
 2021-12-16 18:19:44 +00:00
Etienne Ruffieux
dd6d9f9f6c Merge "Renamed bluetooth apex name to com.android.bluetooth" 2021-12-16 18:10:44 +00:00
Etienne Ruffieux
71f856909f Renamed bluetooth apex name to com.android.bluetooth 
Tag: #feature
Bug: 206614050
Test: Compiles
Change-Id: I938453612da6879a1bbb68adfecaaed1d5dc0a0c
 2021-12-15 16:11:15 +00:00
Xin Li
5cc7cec66e [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: I1c15a27d8a78adbe60ecbc1732457f42e5770cfb
 2021-10-08 08:29:53 +00:00
Xin Li
3a30e79d30 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: Ia3216761d230815fb591350264c8799798e718d0
 2021-10-08 07:56:55 +00:00
Xin Li
8174082796 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: Idab883eab066d41db00ca29f8c7532e18de5ff06
 2021-10-08 01:39:40 +00:00
Xin Li
e5af18bbac [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: I0a9c8548d6610f1f3d719b41c21bd40591a29673
 2021-10-08 01:20:14 +00:00
Xin Li
0bfa3fc1cd Merge "Merge Android 12" 2021-10-07 23:50:23 +00:00
Xin Li
1b5221d9fe Merge Android 12 
Bug: 202323961
Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
 2021-10-06 22:52:53 +00:00
Xin Li
fec72c2c90 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours 
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

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

Change-Id: Ie7bbc6582a27a2fde3560a02d1f124418fdea0c7
 2021-08-17 20:32:44 +00:00
Xin Li
d327f4f001 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours 
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

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

Change-Id: Ic2f02ed8fd742c45860ecc2989fb060233d6701c
 2021-08-17 19:46:39 +00:00
Xin Li
472cef1b5e [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours 
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

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

Change-Id: Ic566c9da8ba56244997e125548f2b643708054d1
 2021-08-17 18:36:09 +00:00
Xin Li
a950cd9905 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9
Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
 2021-08-14 06:31:12 +00:00
TreeHugger Robot
dcb2d8bd81 Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev am: d2c2a20682 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063

Change-Id: I18d2a0819145e1f02c8868674eab081ab243f0a9
 2021-05-08 20:11:03 +00:00
TreeHugger Robot
ace123a6c7 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902

Change-Id: Ib3cdd864f2f788d9a5c39be79cc37d626426565b
 2021-05-08 20:10:57 +00:00
TreeHugger Robot
d2c2a20682 Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev 2021-05-08 19:55:50 +00:00