1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-10 00:20:35 +01:00

757 Commits

Author SHA1 Message Date
Android Build Merger (Role)
589e1e861f [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6
Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
2018-10-11 23:09:59 +00:00
Jean-Michel Trivi
2eaadebcb6 DO NOT MERGE Prevent out of bounds accesses in lppTransposer()
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I77bd1e1dfab3bac92b4522170bdc3c9eb56fdf82
2018-10-11 23:09:57 +00:00
Jean-Michel Trivi
56ef80d7fe Prevent out of bounds accesses in lppTransposer()
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I789030b116da7f8ea261001b43ef6c677dd58a3d
Merged-In: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
2018-10-11 14:49:35 -07:00
android-build-team Robot
b4ffa34eb0 Snap for 5058880 from 927448349c11391dae98fe1581813ae7ea1520ad to pi-qpr2-release
Change-Id: I29a06049a91662e96b50e7776d55bcc79123ad19
2018-10-10 03:04:31 +00:00
Jean-Michel Trivi
2854586c7b Merge "Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()" into pi-dev am: 927448349c
am: 5c57262ba9

Change-Id: Ifb0e9cc9443ab7b01148440f26e0d530c665a7d9
2018-10-08 15:45:59 -07:00
Jean-Michel Trivi
5c57262ba9 Merge "Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()" into pi-dev
am: 927448349c

Change-Id: I0cb9555fbc809e8d7538650b1fda3c4f31a998eb
2018-10-08 15:07:25 -07:00
Jean-Michel Trivi
927448349c Merge "Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()" into pi-dev 2018-10-08 21:20:57 +00:00
Fraunhofer IIS FDK
4dad829df0 Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()
Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
2018-10-05 10:41:10 -07:00
Jean-Michel Trivi
bc9d2aeb0b Merge "Signed Integer Overflow in DuckerCalcEnergy()" am: 78f80da872 am: efe7d49245
am: 1f213910f0

Change-Id: I0892c5ac44b026f47a8c698277f402a633e1569f
2018-10-04 17:26:13 -07:00
Jean-Michel Trivi
1f213910f0 Merge "Signed Integer Overflow in DuckerCalcEnergy()" am: 78f80da872
am: efe7d49245

Change-Id: I0b490ebc34b9fe4f0e041e2b50bc19bad7cf7d6b
2018-10-04 17:20:56 -07:00
Jean-Michel Trivi
efe7d49245 Merge "Signed Integer Overflow in DuckerCalcEnergy()"
am: 78f80da872

Change-Id: If4010115866eeb52033fa361aafdb6665c824471
2018-10-04 17:15:49 -07:00
Jean-Michel Trivi
78f80da872 Merge "Signed Integer Overflow in DuckerCalcEnergy()" 2018-10-04 23:59:49 +00:00
Fraunhofer IIS FDK
b4e3109937 Signed Integer Overflow in DuckerCalcEnergy()
Bug: 112122038
Bug: 112891546
Test: see b/112122038 for repro stream
Change-Id: I7542e2a9033c2e97bf32e0be3bbc6f48746d28f0
2018-10-04 14:50:18 -07:00
android-build-team Robot
40b48a8231 Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to pi-qpr2-release
Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
2018-10-02 22:11:05 +00:00
Jean-Michel Trivi
13846446b7 Merge "Unify audio element loop abort criterion in ER syntax" into pi-dev am: 28234107a7
am: 4a6124d231

Change-Id: I12aa62bfe5cc0c2900e6eb0e5427dba5f8a40068
2018-10-01 17:14:22 -07:00
Jean-Michel Trivi
4a6124d231 Merge "Unify audio element loop abort criterion in ER syntax" into pi-dev
am: 28234107a7

Change-Id: Ia73489f89bb0f04d2ef5e7b7053c2e211e73239a
2018-10-01 16:32:06 -07:00
Jean-Michel Trivi
28234107a7 Merge "Unify audio element loop abort criterion in ER syntax" into pi-dev 2018-10-01 22:19:05 +00:00
Fraunhofer IIS FDK
40214e1496 [automerger skipped] Always check whether given channel config is supported. am: 25b209f229
am: 1ef3f5d620  -s ours

Change-Id: I5d82544a16e2df854fe383aaf8d54d2b1986d19f
2018-10-01 12:33:13 -07:00
Fraunhofer IIS FDK
1ef3f5d620 Always check whether given channel config is supported.
am: 25b209f229

Change-Id: I04b86431f7eccfdc4cef573c594f81ed6e77555a
2018-10-01 12:16:56 -07:00
Fraunhofer IIS FDK
25b209f229 Always check whether given channel config is supported.
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
2018-09-28 16:47:37 +00:00
Fraunhofer IIS FDK
3dd3822755 Always check whether given channel config is supported.
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
2018-09-28 08:28:16 -07:00
Fraunhofer IIS FDK
f2bc07da2e Unify audio element loop abort criterion in ER syntax
Bug: 112891548
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
2018-09-27 14:28:50 -07:00
android-build-team Robot
b97c2a93f2 Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release
Change-Id: Ib805bf06d51e2a7e6f0d9bf2676dc1f21b6cbb9e
2018-09-10 23:21:17 +00:00
Fraunhofer IIS FDK
9744e41c40 Prevent bit buffer counter overflow.
While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Bug: 112662184
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
(cherry picked from commit 15292f7e9620caf9e8df26a62efc2a2891ea822e)
2018-09-10 23:19:19 +00:00
Fraunhofer IIS FDK
61381bd0f4 Break audio element loop in case element_count becomes too large.
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
(cherry picked from commit 3347cfb91a7ecabf5800d72e936f04ce44752bf3)
2018-09-10 23:19:16 +00:00
Fraunhofer IIS FDK
c2208f2a30 Add sampling rate sanity check
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
(cherry picked from commit ba003785774efe355bcac950158fc78a0cff0c2b)
2018-09-10 23:19:14 +00:00
Jean-Michel Trivi
ad1c598166 Merge "Prevent bit buffer counter overflow." into pi-dev am: 42f714f2ab
am: f5b4032cb3

Change-Id: Iea9bfb25f421845921ddbcfbc0f612b3e435d1eb
2018-09-06 16:49:19 -07:00
Jean-Michel Trivi
f5b4032cb3 Merge "Prevent bit buffer counter overflow." into pi-dev
am: 42f714f2ab

Change-Id: Iafb53ad6b61de977951f4a913250bcdc21e0af8d
2018-09-06 16:26:15 -07:00
Jean-Michel Trivi
42f714f2ab Merge "Prevent bit buffer counter overflow." into pi-dev 2018-09-06 23:02:17 +00:00
Jean-Michel Trivi
8f5c6c2b21 Merge "Break audio element loop in case element_count becomes too large." into pi-dev am: 4d801e44ba
am: a083f27afb

Change-Id: I08e08b06d45c782f7cea15b06d370a0ef9920db2
2018-09-06 14:45:44 -07:00
Jean-Michel Trivi
a083f27afb Merge "Break audio element loop in case element_count becomes too large." into pi-dev
am: 4d801e44ba

Change-Id: I292c02e17ccea89968214f59f3a8dcfd7af4fbb2
2018-09-06 14:34:34 -07:00
Jean-Michel Trivi
4d801e44ba Merge "Break audio element loop in case element_count becomes too large." into pi-dev 2018-09-06 21:15:30 +00:00
Fraunhofer IIS FDK
983a134adb Merge "Prevent overflow in concealment clipping check" into pi-dev am: b3ea08e059
am: 646ead1a65

Change-Id: I76943ca6e6c4541924c34ce6e7da5bf95676abec
2018-09-06 13:34:42 -07:00
Fraunhofer IIS FDK
b5a223ae08 Add sampling rate sanity check am: ba00378577
am: 4d1f3e3cfb

Change-Id: Ibed8fac5a4dee4017db2a3833feadefd3c49ea8a
2018-09-06 13:32:29 -07:00
Fraunhofer IIS FDK
646ead1a65 Merge "Prevent overflow in concealment clipping check" into pi-dev
am: b3ea08e059

Change-Id: I70d38eed9d6d6e52bcf00752c482ce92eddf6497
2018-09-06 13:22:37 -07:00
Fraunhofer IIS FDK
4d1f3e3cfb Add sampling rate sanity check
am: ba00378577

Change-Id: I9173c64ea2386a987aa563fc89bdaa7652f649b0
2018-09-06 13:21:58 -07:00
TreeHugger Robot
b3ea08e059 Merge "Prevent overflow in concealment clipping check" into pi-dev 2018-09-06 20:17:07 +00:00
Fraunhofer IIS FDK
f44b50b835 Prevent overflow in concealment clipping check
Bug: 112890225
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
2018-09-05 15:03:18 -07:00
Fraunhofer IIS FDK
3347cfb91a Break audio element loop in case element_count becomes too large.
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
2018-09-05 14:54:44 -07:00
Fraunhofer IIS FDK
ba00378577 Add sampling rate sanity check
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
2018-09-05 14:05:32 -07:00
Chih-hung Hsieh
1a7b548917 Merge "Suppress -Wimplicit-fallthrough." am: 8704782ffd am: fa1ce53961
am: 5caf4ae2e9

Change-Id: I4cb5ea83912112ed458d538997a0e70ad967673b
2018-09-05 10:11:59 -07:00
Chih-hung Hsieh
5caf4ae2e9 Merge "Suppress -Wimplicit-fallthrough." am: 8704782ffd
am: fa1ce53961

Change-Id: I17099cda4a919b28aab856fffbb843609bf56cf9
2018-09-05 09:50:56 -07:00
Chih-hung Hsieh
fa1ce53961 Merge "Suppress -Wimplicit-fallthrough."
am: 8704782ffd

Change-Id: I4712438bc10c81df6fef4d3a8ea6efeae483a6fe
2018-09-05 09:42:47 -07:00
Chih-hung Hsieh
8704782ffd Merge "Suppress -Wimplicit-fallthrough." 2018-09-05 16:30:42 +00:00
Chih-Hung Hsieh
96ed252649 Suppress -Wimplicit-fallthrough.
-Wimplicit-fallthrough will be enabled globally.

Test: build with global -Wimplicit-fallthrough.
Change-Id: I13b4402d9df23a888bdc80be4ce39cd5cd4cff7f
2018-09-04 14:20:04 -07:00
Fraunhofer IIS FDK
15292f7e96 Prevent bit buffer counter overflow.
While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Bug: 112662184
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
2018-08-17 16:36:07 -07:00
Fraunhofer IIS FDK
62623d8d79 FDK sanitization fixes
Bug: 110641440
Bug: 109936783
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Prevent bit buffer counter overflow.

While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7

Fix call to function sbrDecoder_Header() through pointer to incorrect function type.

While testing FDK in Android P DP3 x86 64bit emulator we observed a runtime error.
The function parameter of the callback didn't use a typeless pointer.
Following patch contains a revised sbr decoder callback function with explicit data type cast to be inline with all other callbacks in FDK.

Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e

Fix huffman decoder escape sequence length limitation.

Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601

Prevent overflow in MPEG-D DRC _setSelectionDataInfo().

Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9

Add sanity check for allowed LPD sampling rate.

Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896

Always check whether given channel config is supported.

Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba

Unsigned Integer Overflow in aacDecoder_DecodeFrame().

Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d

Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader().

Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d

Unsigned Integer Overflows in mpegSurroundDecoder_Parse().

Change-Id: I3714e88d7a9a866297bb2e93571804665a97773f

Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit().

Change-Id: Ie4924460d30ea4ef76917704ded809d04db78993

Unsigned Integer Overflow in transportDec_readHeader().

Change-Id: I0beedab38175fc57e5bd9eb5700a3850ef2bebf7

UBSAN overflow in FFT

An overflow in the fft was observed for certain configurations. The root cause was in the scaling of the fft input data in dct_IV and dst_IV.
The following patch revises the scaling in dct and removes the unused arm implementation.

Change-Id: Idc9c44a9755b8151d5c7d8107696f43ac592413b
2018-08-14 16:56:02 +00:00
Xin Li
e2fc820df9 Merge "Merge Android Pie into master" am: 7027cd8748 am: 6acb615429 am: c382b2dd60
am: fa9b252972

Change-Id: I98fd754133700f09c85e6800dcc279194cad12d5
2018-08-08 01:18:26 -07:00
Xin Li
fa9b252972 Merge "Merge Android Pie into master" am: 7027cd8748 am: 6acb615429
am: c382b2dd60

Change-Id: If019fd3b379287c9beb8e4e1419e5a2ec530c160
2018-08-07 20:45:13 -07:00
Xin Li
c382b2dd60 Merge "Merge Android Pie into master" am: 7027cd8748
am: 6acb615429

Change-Id: I1e133a180eccad7a726a4f37ebbf378a5f15c7a4
2018-08-07 17:03:12 -07:00