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

1404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
TreeHugger Robot
4a9bfbf730 Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev 2021-05-08 19:50:20 +00:00
Fraunhofer IIS FDK
f724d3361f Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients(). 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibd70f0c3e591d5581e5fe2a7469181bc0ba95a3c
 2021-05-07 15:24:59 -07:00
Fraunhofer IIS FDK
1cf293e454 Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: I9e1cb5ba113f5df4df76be7e1bee5e2cbdd8ccca
 2021-05-07 21:49:57 +00:00
Fraunhofer IIS FDK
9b481d3556 Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: Iaa3a1546fa0d8a92de3b1434b93d810b6e00e1a7
 2021-05-07 21:49:56 +00:00
Fraunhofer IIS FDK
877f2d687c Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

Change-Id: Idd546b91b3986a8b6cc24aee7dd74f34c04d3c98
 2021-05-07 21:49:52 +00:00
Fraunhofer IIS FDK
b71181dec5 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259

Change-Id: I8ea16bff79bee98ecc43d393eb07b27f858c15d2
 2021-05-07 21:49:41 +00:00
Fraunhofer IIS FDK
8077876e6d Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: 56de8e29ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258

Change-Id: I919188f860f8c9a1eb629328ef7192a8d6554b11
 2021-05-07 21:49:00 +00:00
Fraunhofer IIS FDK
6bfd703af9 Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows. am: 773ff1d3e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257

Change-Id: Iac3f458c5f7381667bb72edb0246a38e8954ab13
 2021-05-07 20:41:44 +00:00
Fraunhofer IIS FDK
675de1faf2 Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256

Change-Id: Ic04dff8bffc77eb7a178f816b9f67af1381f5a81
 2021-05-07 20:41:39 +00:00
Fraunhofer IIS FDK
09cf32a6c7 Refine aacDecoder_DecodeFrame() output buffer parameter type description. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I83a460d03c7cde3e4f74011a7c3556c4cfd08cdd
 2021-05-07 12:44:36 -07:00
Fraunhofer IIS FDK
c2416f5e93 Add parameter pointer check to aacEncInfo() encoder API function. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf
 2021-05-07 12:44:00 -07:00
Fraunhofer IIS FDK
2a40fde39d Prevent too large shift exponent in apply_inter_tes() and merge two loops. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I9ecb7fbae0a2c2c24af9067846afcf499b021608
 2021-05-07 12:33:38 -07:00
Fraunhofer IIS FDK
e5a14d0a33 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ib83bd37861e1e24ff18ea276244a370962808fcf
 2021-05-07 12:32:45 -07:00
Fraunhofer IIS FDK
92dd536642 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. 
Bug: 186777497
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ifed0885abdbbfb2e2d4d94bc482e5e1e30794049
 2021-05-07 10:56:20 -07:00