fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
623 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

623 Commits

Author SHA1 Message Date
Jean-Michel Trivi 40676e7cba Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." 
am: fb65c0c24b

Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
 2018-10-12 11:57:26 -07:00
Jean-Michel Trivi fb65c0c24b Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." 2018-10-12 18:33:22 +00:00
Fraunhofer IIS FDK 9db742a7d3 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.

Bug: 112662306
Bug: 116075869
Test: on x86: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
 2018-10-12 12:02:30 -04:00
Jean-Michel Trivi ad279bdc1d [automerger skipped] Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 am: 0ff211e4fb -s ours am: 69514bb308 -s ours 
am: a3ac89586b  -s ours

Change-Id: I3546240c494ba6f4c66c262789ad4ba9be1e0400
 2018-10-12 05:06:20 -07:00
Jean-Michel Trivi a3ac89586b [automerger skipped] Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 am: 0ff211e4fb -s ours 
am: 69514bb308  -s ours

Change-Id: I1654e50401da46c5cbd3dc0fe35bfa2a0a20f547
 2018-10-12 04:54:26 -07:00
Jean-Michel Trivi 69514bb308 [automerger skipped] Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 
am: 0ff211e4fb  -s ours

Change-Id: I4355b82503373ae3858a4f374ba62bbf923566ec
 2018-10-12 04:49:02 -07:00
Jean-Michel Trivi 0ff211e4fb Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea 
am: 1c4c4a8c97

Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
 2018-10-12 04:41:31 -07:00
Jean-Michel Trivi 1c4c4a8c97 Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 
am: 5a025c4fea

Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
 2018-10-12 04:33:58 -07:00
TreeHugger Robot 5a025c4fea Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 2018-10-12 11:26:30 +00:00
Jean-Michel Trivi 6a2e4876f8 [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 am: 14ea3dc906 -s ours am: 863b4b3b3f 
am: 540f1c46c6  -s ours

Change-Id: Ie83d3fa61dd743f1df9c0cc5479a6da11e33b5d2
 2018-10-11 19:56:16 -07:00
Jean-Michel Trivi 540f1c46c6 [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 am: 14ea3dc906 -s ours 
am: 863b4b3b3f

Change-Id: I2adff4ed59b9834ab2ebc4539aafaf9942e7e2b3
 2018-10-11 19:48:58 -07:00
Jean-Michel Trivi 863b4b3b3f [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 
am: 14ea3dc906  -s ours

Change-Id: Ia03fc2d353c2a39318fa752f3c6f152c43bf6138
 2018-10-11 19:44:22 -07:00
Jean-Michel Trivi 14ea3dc906 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 
am: 162f98a177

Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
 2018-10-11 19:39:58 -07:00
Jean-Michel Trivi 162f98a177 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
am: 14fd59e8c4

Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
 2018-10-11 19:35:07 -07:00
Android Build Merger (Role) 14fd59e8c4 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
 2018-10-11 23:10:04 +00:00
Android Build Merger (Role) c7e9a56431 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 
Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
 2018-10-11 23:10:03 +00:00
Android Build Merger (Role) 9c00c42d95 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 
Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
 2018-10-11 23:10:01 +00:00
Android Build Merger (Role) e2491a2024 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f 
Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
 2018-10-11 23:10:00 +00:00
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
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
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 15292f7e96)
 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 3347cfb91a)
 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 ba00378577)
 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