aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add license_note" am: 3070cab376 am: 53c773b1ceTreehugger Robot2022-03-081-0/+4
|\ \ | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I264e8378920565bcaa08d057cbd262e1260a5a6f
| * | Merge "Add license_note" am: 3070cab376Treehugger Robot2022-03-081-0/+4
|/| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I21f518a6f6617cb68c06fc131e38ac3c0991f28a
| * | Merge "Add license_note"Treehugger Robot2022-03-081-0/+4
|/| |
| * | Add license_noteBob Badour2022-03-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: I46129df85a9242587621756be25d797bf90428d6
* | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 am: acbcc9b9f3 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: Iff49e44b95b4c812cfedfe4de438fa081d8dc534
| * \ \ Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I8f89b5cf299b92478fdeea4df43dcd1544ec4a6d
| | * | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6cEtienne Ruffieux2021-12-161-1/+1
| |/| | | | | |/ / | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I86050beb93e24fa9fda8ad977b39429a1739316a
| | * | Merge "Renamed bluetooth apex name to com.android.bluetooth"Etienne Ruffieux2021-12-161-1/+1
| |/| |
| | * | Renamed bluetooth apex name to com.android.bluetoothEtienne Ruffieux2021-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag: #feature Bug: 206614050 Test: Compiles Change-Id: I938453612da6879a1bbb68adfecaaed1d5dc0a0c
* | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s oursXin Li2021-10-080-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | Merge "Merge Android 12"Xin Li2021-10-0748-822/+1161
| | | | |\ \
| | | | | * | Merge Android 12Xin Li2021-10-0648-822/+1161
| | | | |/| | | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 202323961 Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
* | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|/| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * / / / [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|/| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1448-822/+1161
| |\ \ \ | |/ / / |/| / / | |/ / | | | Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9 Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
* | | Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | description." into sc-dev am: d2c2a20682 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063 Change-Id: I18d2a0819145e1f02c8868674eab081ab243f0a9
| * | Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
| |\ \ | | | | | | | | | | | | description." into sc-dev
| | * | Refine aacDecoder_DecodeFrame() output buffer parameter type description.Fraunhofer IIS FDK2021-05-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I83a460d03c7cde3e4f74011a7c3556c4cfd08cdd
* | | | Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value ↵TreeHugger Robot2021-05-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902 Change-Id: Ib3cdd864f2f788d9a5c39be79cc37d626426565b
| * | | Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value ↵TreeHugger Robot2021-05-081-2/+2
| |\ \ \ | | |/ / | |/| | | | | | in _skipEqCoefficients()." into sc-dev
| | * | Adjust eqSubbandGainFormat data type to prevent load of invalid value in ↵Fraunhofer IIS FDK2021-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _skipEqCoefficients(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ibd70f0c3e591d5581e5fe2a7469181bc0ba95a3c
* | | | Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93Fraunhofer IIS FDK2021-05-073-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062 Change-Id: I9e1cb5ba113f5df4df76be7e1bee5e2cbdd8ccca
| * | | Add parameter pointer check to aacEncInfo() encoder API function.Fraunhofer IIS FDK2021-05-073-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf
* | | | Prevent too large shift exponent in apply_inter_tes() and merge two loops. ↵Fraunhofer IIS FDK2021-05-071-22/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a40fde39d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061 Change-Id: Iaa3a1546fa0d8a92de3b1434b93d810b6e00e1a7
| * | | Prevent too large shift exponent in apply_inter_tes() and merge two loops.Fraunhofer IIS FDK2021-05-071-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I9ecb7fbae0a2c2c24af9067846afcf499b021608
* | | | Use scaleValuesSaturate() to avoid integer overflows in ↵Fraunhofer IIS FDK2021-05-071-33/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmfTransposerApply(). am: e5a14d0a33 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060 Change-Id: Idd546b91b3986a8b6cc24aee7dd74f34c04d3c98
| * | | Use scaleValuesSaturate() to avoid integer overflows in QmfTransposerApply().Fraunhofer IIS FDK2021-05-071-33/+18
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ib83bd37861e1e24ff18ea276244a370962808fcf
* | | | Pass flushing flag to SBR module for stereo config index 3 as for stereo ↵Fraunhofer IIS FDK2021-05-071-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config index 1 and 2. am: 92dd536642 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259 Change-Id: I8ea16bff79bee98ecc43d393eb07b27f858c15d2
| * | | Pass flushing flag to SBR module for stereo config index 3 as for stereo ↵Fraunhofer IIS FDK2021-05-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config index 1 and 2. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ifed0885abdbbfb2e2d4d94bc482e5e1e30794049
* | | | Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: ↵Fraunhofer IIS FDK2021-05-071-23/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56de8e29ce Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258 Change-Id: I919188f860f8c9a1eb629328ef7192a8d6554b11
| * | | Utilize dynamic scaling in slotAmp() to avoid signed integer overflows.Fraunhofer IIS FDK2021-05-071-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ia66fbbd16dec4f9e04d67463cca91d75f3741131
* | | | Adapt scaling in combineSignalCplxScale*() to prevent signed integer ↵Fraunhofer IIS FDK2021-05-071-15/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflows. am: 773ff1d3e8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257 Change-Id: Iac3f458c5f7381667bb72edb0246a38e8954ab13
| * | | Adapt scaling in combineSignalCplxScale*() to prevent signed integer overflows.Fraunhofer IIS FDK2021-05-071-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: If773c90ccd256fd03641446c7f8bd82d04a100e4
* | | | Fix fixmadddiv2_DD() integer overflow in ↵Fraunhofer IIS FDK2021-05-071-11/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). am: 85a3977fdf Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470256 Change-Id: Ic04dff8bffc77eb7a178f816b9f67af1381f5a81
| * | | Fix fixmadddiv2_DD() integer overflow in ↵Fraunhofer IIS FDK2021-05-071-11/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | SpatialDecApplyM2_Mode212_ResidualsPlusPhaseCoding(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I6237be90ed15e107cc4468770da7c330cdeef16f
* | | Avoid unintentional sign conversions in lppTransposer() and ↵Fraunhofer IIS FDK2021-05-071-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | lppTransposerHBE(). am: 48e0fa028d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373124 Change-Id: Ib442c1ba18a5897d34369245eefc84d16c941574
| * | Avoid unintentional sign conversions in lppTransposer() and lppTransposerHBE().Fraunhofer IIS FDK2021-05-061-10/+10
| | | | | | | | | | | | | | | | | | Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Ifc4618b8de4e377df28e387fb976ab5acb5883d7
* | | Merge "Validate whether all PCE listed element instance tags are present in ↵TreeHugger Robot2021-05-061-0/+87
|\| | | | | | | | | | | | | | | | | | | | | | | raw_data_block." into sc-dev am: 8d746cfdb4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373122 Change-Id: Iea02ef7cf0ed422eb6c30fb8ad10577f3c491b67
| * | Merge "Validate whether all PCE listed element instance tags are present in ↵TreeHugger Robot2021-05-061-0/+87
| |\ \ | | | | | | | | | | | | raw_data_block." into sc-dev
| | * | Validate whether all PCE listed element instance tags are present in ↵Fraunhofer IIS FDK2021-04-291-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raw_data_block. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I299d3c11ffa65a7c09c437cd114d62b8d3013e2f
* | | | Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵TreeHugger Robot2021-05-062-23/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121 Change-Id: I51b0c8c03fe7f1b6e14a802f7340e121d4186fe9
| * | | Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵TreeHugger Robot2021-05-062-23/+22
| |\| | | | | | | | | | | | | | FDK_get32() to prevent endless loop." into sc-dev
| | * | Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and ↵Fraunhofer IIS FDK2021-04-292-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDK_get32() to prevent endless loop. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: Icaedd341f4602882f72ff5e7be71d99ce08f3bec
* | | | Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4TreeHugger Robot2021-05-053-20/+27
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120 Change-Id: I57870b525ba546597390102d6c53dd847438c2cc
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 12:36:23 +0000