aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mstorjo/master' into dabplus2dabplus2Matthias P. Braendli2020-09-1538-1388/+4691
|\
| * Avoid undefined shifts in SATURATE_SHIFTMartin Storsjo2020-09-021-2/+13
| | | | | | | | | | | | | | | | | | | | | | Make sure that the shift amount is less than the size of the shifted value, otherwise return the saturation max values (for left shift, if the source values was nonzero) or zero (for right shift, or zero shifted left). Fixes: 24376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-6529411206348800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Don't use an enum for a value read directly from the bitstreamMartin Storsjo2020-07-171-3/+2
| | | | | | | | | | | | | | | | | | | | The enum doesn't cover all possible values read from the bitstream. This fixes undefined behaviour sanitizer errors. Fixes: 23719/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5111020367642624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Avoid undefined shiftsMartin Storsjo2020-06-221-0/+3
| | | | | | | | | | | | Fixes: 23522/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5468272958111744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Don't store a value read directly from the bitstream in an enumMartin Storsjo2020-06-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, the enum only has one single allowed value, while the bitstream can contain a number of different values. Don't load the unchecked value into an enum variable, because storing the disallowed values in the enum variable is undefined behaviour. Instead store it in an int, until the value has been verified to be the allowed one. This fixes undefined behaviour sanitizer errors. Fixes: 23192/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5205702892322816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Don't use an enum for a value read directly from the bitstreamMartin Storsjo2020-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | The enum doesn't cover all possible values read from the bitstream. This fixes undefined behaviour sanitizer errors. Fixes: 22486/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5735284884111360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Don't use an enum for a value read directly from the bitstreamMartin Storsjo2020-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | The enum doesn't cover all possible values read from the bitstream. This fixes undefined behaviour sanitizer errors. Fixes: 20376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-4785514974806016.dms Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * Merge remote-tracking branch 'aosp/master'Martin Storsjo2020-01-090-0/+0
| |\
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I809fba949d51f01395793ccb36118e4f5c42e5be
| | | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am: 7fc6e3f8ff -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
| | | | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | | | |\ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
| | * | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I058d0d709bb7752aa276e0047d2e0b81403ee5fc Merged-In: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
| | | | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | | |/| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 am: 35b1ada3b4 Change-Id: I735bbaf8236207a00fb745c8e57a04c77b76b432
| | | | * [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
| | | | * [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| | | | |\ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | am: d929f68a05 -s ours am skip reason: subject contains skip directive Change-Id: Iabc2e26ef91b10d03f213fa1a694cb921ca4c1bb
| | | * | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am: bf68b4972f Change-Id: I05880e6e76d61b683b55364726e841097f130a16
| | | | * [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am skip reason: subject contains skip directive Change-Id: I69945c03e154530e7d917f1de7f0669480715686
| | | * | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am: 50d8447d97 Change-Id: Ifb01dd1cbab4f450563f31f93c19dad5bf079404
| | | | * | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am skip reason: subject contains skip directive Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
| | | * | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-020-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 4d56b880e2 Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8
| | | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am: 058d1295f4 Change-Id: Icf8cfab1834934bd73b2d7cefdfcffc3ac225dc6
| | | * \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours am: f8d9637d81 Change-Id: Iba3e60f6fb4670f7f97159c42fc3ff366817a3b1
| | | * \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-06-050-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am: 68078adb95 Change-Id: If38052df38ec81ce9e488ab9a58bc61724f2e664
| | | * \ \ \ \ \ \ Integer overflow fix in FDKaacEnc_initAvoidHoleFlag() am: 5def92cb0fFraunhofer IIS FDK2019-05-170-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5e7e6f4e14 Change-Id: I1fef6737e3702c3fd31848f4061d4d92733cbcd6
| | | * \ \ \ \ \ \ \ Integer overflow fix in FDKaacEnc_initAvoidHoleFlag() am: 5def92cb0fFraunhofer IIS FDK2019-05-171-7/+5
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a79871af3c Change-Id: I37b2577508e6f7f7d48f6b056c27f5eabe1fd9b5
| | | | * \ \ \ \ \ \ \ Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()Fraunhofer IIS FDK2019-05-171-7/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5def92cb0f Change-Id: Ib2bb23763ffadc6a34669d0db79d203991cdf141
| | | * | \ \ \ \ \ \ \ \ Fix integer overflow in FDKaacEnc_IntensityStereoProcessing(). am: 55002323b3Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b94fe764e Change-Id: Ic1146f0be0b1c59384abd3e0fa396a2881f2899c
| | | * \ \ \ \ \ \ \ \ \ \ Improve phase coding accuracy by use of splitAngle lookup table. am: f6a6a071a9Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8aa2932bac Change-Id: Ia00cdeb2c557457dadd2c7d2d873121b2e4f27f3
| | | * \ \ \ \ \ \ \ \ \ \ \ Improve random phase table accuracy. am: 818743f718Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5871d262db Change-Id: I871b4f44a50bfa9a92da8faf9b9e2524c23fcda4
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Increase scale factor gain in TES tool. am: 2ef020c93aFraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: de38ed2500 Change-Id: I658ce725def59b428137b3d3391b9663fa45fcfd
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Improve accuracy of division in calcSubbandGain(). am: 69a5c189adFraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 17e60ff0c4 Change-Id: Ia49418e4aa24d0f9d101a4e1ea475d2736121b67
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Avoid -1.0 autocorrelation input data. am: e51063ca54Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b1f3f35219 Change-Id: I5238df68d02754a1faaffd49d7ffed2361f972f9
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Increase scale factor to avoid overflows in function factorCLD(). am: ce00007148Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f8c4039069 Change-Id: I1319ca784270c564ccb320ff93dcc94c96bf0738
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix out of sync function declaration of scaleValues(). am: 1b5457fe93Fraunhofer IIS FDK2019-05-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 73441adf7f Change-Id: I8ab26ca4a1d61c88a21fe8e56f868c7192e9eb35
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix integer overflow in FDKaacEnc_IntensityStereoProcessing(). am: 55002323b3Fraunhofer IIS FDK2019-05-151-6/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d4a622c288 Change-Id: I76ddc86c1f0f521eba89fc30770d949905e55f20
| | | | * | | | | | | | | | | | | | | | | Fix integer overflow in FDKaacEnc_IntensityStereoProcessing().Fraunhofer IIS FDK2019-05-151-6/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55002323b3 Change-Id: I7f14e3b7bd79110eff8b01184483ab4e2c4fc9b3
| | | * | | | | | | | | | | | | | | | | | | Improve phase coding accuracy by use of splitAngle lookup table.Fraunhofer IIS FDK2019-05-153-81/+3760
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f6a6a071a9 Change-Id: I02dc1d25cc7f3d317a1bac64f0368175813eb5f5
| | | * | | | | | | | | | | | | | | | | | | Improve random phase table accuracy.Fraunhofer IIS FDK2019-05-152-1063/+537
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 818743f718 Change-Id: I2cf4e3aec1ec54f629c614cd00090d1fea2ff347
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Increase scale factor gain in TES tool.Fraunhofer IIS FDK2019-05-151-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2ef020c93a Change-Id: I45d8b1c72ef68401de0bca03bb0888bab361a5f8
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Improve accuracy of division in calcSubbandGain().Fraunhofer IIS FDK2019-05-151-2/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 69a5c189ad Change-Id: I2bc889856aa9b066ba5d1c2043a6864b2455733f
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Avoid -1.0 autocorrelation input data.Fraunhofer IIS FDK2019-05-151-3/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e51063ca54 Change-Id: Ic059b05ceb43d993900805c746382d17adc52ee8
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Increase scale factor to avoid overflows in function factorCLD().Fraunhofer IIS FDK2019-05-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ce00007148 Change-Id: I5527c89c4ec9f1ec5e3c3e733ed7446f49561d8f
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fetch multiple samples of input channels from encoder input buffer. am: ↵Fraunhofer IIS FDK2019-05-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89ca476e52 am: 9524549fbf Change-Id: Ie7df2c76c7ff0948be16c7858c36443c5e1172be
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix out of sync function declaration of scaleValues().Fraunhofer IIS FDK2019-05-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1b5457fe93 Change-Id: I377aad010627a1bfef3280edca2e07f5a5905260
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fetch multiple samples of input channels from encoder input buffer.Fraunhofer IIS FDK2019-05-151-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 89ca476e52 Change-Id: I7cde3746816d1d9ecfacae91a367d34cc545c009
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use an enum for a value read directly from the bitstreamMartin Storsjo2020-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enum only defined values 1-7, while the variable can be set to any value between 0 and 15 that is read from the bitstream by FDKreadBits(hBs, 4). This fixes undefined behaviour sanitizer errors. Fixes: 19500/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5730449188192256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Reapply: Avoid reading out of bounds due to negative aaIccIndexMapped"Martin Storsjo2019-10-081-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e6bb25613016ecd64ccbcb354768b4794ffd6351. It seems like this isn't needed any longer on the latest upstream version.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Reapply: Avoid reading out of bounds due to too large aaIidIndexMapped"Martin Storsjo2019-10-081-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28fdc28ec436ceafb11ceb6a354e9916c5265981. It seems like this isn't needed any longer on the latest upstream version.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Avoid index-out-of-bounds in prepareDrcGain"Martin Storsjo2019-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cc5c85dd70f04178abccfd2c5539b13e01da78d8. It seems like this isn't needed any longer on the latest upstream version.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Avoid index-out-of-bounds in prepareDrcGain"Martin Storsjo2019-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ab5496af95674e9ee741cba178d5b981bccbe45. It seems like this isn't needed any longer on the latest upstream version.