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,645 Commits 10 Branches 11 Tags 9.6 MiB
Commit Graph

1645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
915bb8c5e2 [automerger skipped] [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -s ours am: fa701f794c -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/+/17615051

Change-Id: Ic1f60238b63966a539af02c42df798a575fcf209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:52:30 +00:00
Ray Essick
7b9ef3a6e7 [automerger skipped] Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev am: 50b881083a -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 067929dcd3 is already in history

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

Change-Id: I417f6376fd886b553f9cc62f78843bc9e1ace0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:43 +00:00
Fraunhofer IIS FDK
e9c55650f1 [automerger skipped] [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca am: b70aa8fe34 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 067929dcd3 is already in history

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

Change-Id: Id45242e0af8e42ca395f63ebe58709bca23dd804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:42 +00:00
Fraunhofer IIS FDK
fa701f794c [automerger skipped] [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -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/+/17615051

Change-Id: Ie699de60dc56fbb19dc4a9cd27c03235515df69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:59:46 +00:00
Ray Essick
50b881083a Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev 
* changes:
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c
  Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
 2022-04-06 21:45:21 +00:00
Fraunhofer IIS FDK
83f9450b43 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 067929dcd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Change-Id: I2a93360d07eed2f773ef9612b1c2ea745dfd5fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:19:39 +00:00
Fraunhofer IIS FDK
b70aa8fe34 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: I41a977f7513be7f6df072011524a4870ac08dfab
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:06:03 +00:00
Fraunhofer IIS FDK
50d66655ca [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: I5ec75e235f096a4e8bd7e82ea3bf5f99353078af
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:05:51 +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
067929dcd3 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:46:26 +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
Treehugger Robot
671c4c80fe Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: Ia38ec1fc4507182ca045ecaacaa4e95b3ab900db
 2022-03-08 17:25:27 +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
e689e65ef6 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 am: acbcc9b9f3 am: 19f5de8354 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: If5fcd63d06db469b8da9f9e896d1c435cf7c170b
 2021-12-16 23:31:19 +00: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
52c48acfd3 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours am: 5cc7cec66e -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: Ic6a83a0fa660a67e3a15967a6824f55156f4b8b9
 2021-10-08 09:00:04 +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
c2a73571b2 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours am: fec72c2c90 -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: I092764b5bf04ed177fed6883341036fdd193ce52
 2021-08-18 00:24:03 +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
Xin Li
6f8272c394 Merge sc-mainline-prod 
Bug: 189946434
Change-Id: I2cb3cdc88d8b13af7d822e97ee6c5edccdeb7795
 2021-06-02 16:48:45 +00:00
TreeHugger Robot
a71807d0be Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type description." into sc-dev am: d2c2a20682 am: dcb2d8bd81 am: 4b2c62dd4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063

Change-Id: I017195d5638fe2b4cab9af37738b89b4b2097024
 2021-05-17 22:52:53 +00:00
TreeHugger Robot
469c91683b Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 am: ace123a6c7 am: 10896bded2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902

Change-Id: I3153f9a116981288a7c6fb418ec3e7b1ebb8ea9e
 2021-05-17 22:52:27 +00:00
Fraunhofer IIS FDK
e93db08f12 Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: 1cf293e454 am: 8c620c3017 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: Ib3f6474771e968f95e86d7d55caabaf313b5e7a0
 2021-05-17 22:51:56 +00:00
Fraunhofer IIS FDK
cd7cc91838 Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d am: 9b481d3556 am: 817f63d1d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: Ie6dee85b92955b3ebb74c2627cc2fa32b20dd5cb
 2021-05-17 22:51:55 +00:00
Fraunhofer IIS FDK
54a56490c9 Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply(). am: e5a14d0a33 am: 877f2d687c am: 71e84d7474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060

Change-Id: I78b6d17115260899c25667e9df31147a10eab903
 2021-05-17 22:51:20 +00:00
Fraunhofer IIS FDK
759cd7a703 Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642 am: b71181dec5 am: 1532a3d868 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259

Change-Id: Ib636a8e855a199dccac0be8b114e9f21cd54a45c
 2021-05-17 22:50:43 +00:00
Fraunhofer IIS FDK
6744350d43 Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: 56de8e29ce am: 8077876e6d am: efc26a0576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258

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

Change-Id: Iddaac5f930ea916bdec9df30989ef78f1d239a99
 2021-05-17 22:49:25 +00:00
Fraunhofer IIS FDK
635998a36b Fix fixmadddiv2_DD() integer overflow in SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf am: 675de1faf2 am: bc774411c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256

Change-Id: I8015d40ba35babdb25c59809c7702ee6269154d1
 2021-05-17 22:43:08 +00:00
Fraunhofer IIS FDK
5e22d53e95 Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE(). am: 48e0fa028d am: ec3a5114d9 am: 91e7648127 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124

Change-Id: I100f79ebeae75f2b2b098815a8e1de8ba3987179
 2021-05-17 22:42:23 +00:00
TreeHugger Robot
96bf993a3f Merge "Validate whether all PCE listed element instance tags are present in raw_data_block." into sc-dev am: 8d746cfdb4 am: 05692deb07 am: 546d75ecd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122

Change-Id: I7602a666497bc4bd7adcb252dc4766a47f4435b1
 2021-05-17 22:41:47 +00:00
TreeHugger Robot
d7419132f2 Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e am: 97d79d7054 am: ba9f2fc54f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121

Change-Id: If74257d200781d61bb6eb066d5fca2e368014946
 2021-05-17 22:41:07 +00:00
TreeHugger Robot
65fffef926 Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4 am: 480c182ae9 am: 086f4c9526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

Change-Id: I4095801191f2f714fc44ae66e25771f677c57530
 2021-05-17 22:40:24 +00:00
TreeHugger Robot
01490d9b51 Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157 am: f092b88a25 am: ca6441ca35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117

Change-Id: Ia4d9762e8e0a72ca1e0354226a8a67daf743b558
 2021-05-17 22:39:32 +00:00