fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-12 01:20:38 +01:00
Code Issues Projects Releases Wiki Activity
544 Commits 10 Branches 11 Tags
Commit Graph

544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
b325367b33 Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader(). 
Bug: 112661893
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d
 2018-11-27 12:34:42 -05:00
Fraunhofer IIS FDK
eb0711921b Unsigned Integer Overflow in aacDecoder_DecodeFrame(). 
Bug: 112661742
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d
 2018-11-27 12:30:10 -05:00
Fraunhofer IIS FDK
d4a32ee888 Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07 am: ac56cddd1f 
am: a16b4cba47

Change-Id: I9739c6a19fffe576aed868880aa7af5912f705eb
 2018-11-05 15:19:22 -08:00
Fraunhofer IIS FDK
a16b4cba47 Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07 
am: ac56cddd1f

Change-Id: I422463f26359bef0ad3220c9324ceb26fcd1da14
 2018-11-05 15:14:17 -08:00
Fraunhofer IIS FDK
ac56cddd1f Merge "Fix huffman decoder escape sequence length limitation." 
am: a4d6ca7b07

Change-Id: I6cac7c525c4b5c5afca58ac6ab3d2c8925fc343e
 2018-11-05 15:09:12 -08:00
Treehugger Robot
a4d6ca7b07 Merge "Fix huffman decoder escape sequence length limitation." 2018-11-05 22:58:33 +00:00
Fraunhofer IIS FDK
1ac4293f0b Prevent overflow in MPEG-D DRC _setSelectionDataInfo(). 
Bug: 112661687
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9
 2018-11-05 15:07:27 -05:00
Fraunhofer IIS FDK
f90be06503 Fix huffman decoder escape sequence length limitation. 
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 112661753

Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601
Merged-In: 62623d8d797a3d7314834c59ebc785e738965635
 2018-11-05 14:43:14 -05:00
Bill Yi
8717d0f65f [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a1c3f92674 -s ours am: add26c57de -s ours 
am: 0404fcb27d  -s ours

Change-Id: I4e6e17277d2a64924b66c4d60d823332105f5783
 2018-10-24 18:40:17 -07:00
Bill Yi
0404fcb27d [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a1c3f92674 -s ours 
am: add26c57de  -s ours

Change-Id: Ia28a0fe677a072b2deb93be7d57f29c1ff25b94f
 2018-10-24 18:11:34 -07:00
Bill Yi
add26c57de [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE 
am: a1c3f92674  -s ours

Change-Id: Ife9cf8d52e066a5575618b2e00eb7ed3c14c65ff
 2018-10-24 16:51:52 -07:00
Bill Yi
a1c3f92674 Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
 2018-10-24 14:45:34 -07:00
Bill Yi
4430a10054 [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: b0cb6303be -s ours 
am: ef66d21367  -s ours

Change-Id: I8105acd0cae2cfe394790a49b6db7846d525bf6a
 2018-10-24 10:31:12 -07:00
Bill Yi
ef66d21367 [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
am: b0cb6303be  -s ours

Change-Id: I08397a31e8c22387ccdd271a2f3c9fb8f8bf22b3
 2018-10-24 10:22:10 -07:00
Bill Yi
b0cb6303be Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
Change-Id: I040acde299d9f3e7556a2dd9393080aabfa20936
 2018-10-24 09:05:20 -07:00
android-build-team Robot
9ea938f950 Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release 
Change-Id: Icee0cd3d40cc7982201e0afe5ba0307a936a8796
 2018-10-20 00:20:48 +00:00
Fraunhofer IIS FDK
5e57019525 Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE() 
Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
(cherry picked from commit 4dad829df00932b89858b9833cf5dcded8d97c37)
 2018-10-20 00:17:02 +00:00
Fraunhofer IIS FDK
0e5db9fee9 Unify audio element loop abort criterion in ER syntax 
Bug: 112891548
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
(cherry picked from commit f2bc07da2ed70eb069f3faab1179c4c89792bf3d)
 2018-10-20 00:17:00 +00:00
Fraunhofer IIS FDK
ce97e7d55e Always check whether given channel config is supported. 
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
(cherry picked from commit 25b209f229879a155759d791fe463b8abd283677)
 2018-10-20 00:16:57 +00:00
Jean-Michel Trivi
4b6bb41eb1 [automerger skipped] Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b am: 40676e7cba 
am: 72f73bc52e  -s ours

Change-Id: Ice85276bd0b1869a79f2e190c384a893a88859c7
 2018-10-12 12:06:34 -07:00
Jean-Michel Trivi
72f73bc52e Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b 
am: 40676e7cba

Change-Id: I07d03570c8173eff319c102ce73c51025afdd056
 2018-10-12 12:01:26 -07:00
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