aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\ | | | | | | | | | | | | | | | | | | | | 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: I85027c16c682104915271362d23763dd91cca9c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | * Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | | * 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
* | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Ib3e00e6f19f7bbf83c745e8caff6853fa48f4453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * | | 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
* | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I9de914da031fcec5f531652cb7a54ec4b509e4db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | 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
* | | | | | [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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 "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: Iec55c398637d4906b7b89979c6292f9e26e012fe
| * | | | | 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: Id42fc123b39c431988b2549b56e9de12036a9020
| * | | | | | 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: Iedde10c45bfcd36c647747d707babc44bfbe5730
| * | | | | | 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: I585bba83fcd1fd2c288b20f492cb72e377533f56
| * | | | | | 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: I033fc46b89137ad74135b36a3c2c9ccdf8de7bd4
| * | | | | | 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: I28a19b03795f2e51b679fade211f959fe75460e6
| * | | | | | 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: I3dd86141caa1d65bb08206b0a86e27b72ace37fd
| * | | | | | 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: I568446484ac45601e15980652490e8cf9fc386eb
| * | | | | | 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: Ib5c4f6c2e9e177b9c4498f6f62c94d89d835629a
| * | | | | | 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: I49564df49b3eb4e604687c4f9d6b7a2f199f1b3a
| * | | | | 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: Ifa758ff72b8c099ba46edc06aa0a15522fddb25d
| * | | | | 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: If933a862e97300cfe27f36d8adae9a1b2fd21bc7
| * | | | | | 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: I8b176d329bcc8eec9abb4c59dede5f42b3b77bec
| * | | | | | Merge changes I42956a9f,I92f7c559,I5af62590 into sc-devTreeHugger Robot2021-05-053-20/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Check the number of available escapes in rvlcDecodeBackward() to avoid out-of-bounds access. Sbr syncstate may only be set to upsampling if the sbr decoder was sucessfully initialized. Perform parameter check before parameter assignment to avoid incorrect initialization in resetFreqBandTables().
| | * | | | | Check the number of available escapes in rvlcDecodeBackward() to avoid ↵Fraunhofer IIS FDK2021-04-291-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounds access. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I42956a9fd7a8e78c3c0f4f553370ac5a9f1ac2ca
| | * | | | | Sbr syncstate may only be set to upsampling if the sbr decoder was ↵Fraunhofer IIS FDK2021-04-291-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sucessfully initialized. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I92f7c559af961ec063bfea74353f11092dcda653
| | * | | | | Perform parameter check before parameter assignment to avoid incorrect ↵Fraunhofer IIS FDK2021-04-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization in resetFreqBandTables(). Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5af625905b1e4365fa84423d186c227a49707f72
* | | | | | | Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157TreeHugger Robot2021-05-051-22/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373117 Change-Id: Icbcbecac2ebf52606b92d1b2e086ae5657e79257
| * | | | | | Merge changes Ic767aeb6,I2aef40ef into sc-devTreeHugger Robot2021-05-051-22/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use local variables for sbr and mps state in CAacDecoder_Init() to avoid inconsistencies in case of failing initialization. Follow-up on: Improve decoder robustness by storing flags and elFlags temporarily.