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

508 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK
bf8adf21ad Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2 am: 6e4fe2e06b
am: 69e052a1af

Change-Id: I17eca04703b565d22659b6a3f8d08e16a818aedc
2018-11-29 11:05:17 -08:00
Fraunhofer IIS FDK
69e052a1af Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2
am: 6e4fe2e06b

Change-Id: Ie017463a9aad54c9b02672c0aa4d1e7f06847427
2018-11-29 11:00:16 -08:00
Fraunhofer IIS FDK
6e4fe2e06b Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"
am: d2be744af2

Change-Id: I780b6c3791bd9bc70fa11a6990cb95a2e5d5ae7c
2018-11-29 10:56:23 -08:00
Treehugger Robot
d2be744af2 Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" 2018-11-29 18:43:33 +00:00
Fraunhofer IIS FDK
24648cbd4f Integer overflow fix in InvMdctTransformLowDelay_fdk()
Bug: 112892194
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I47fdb5b51afd8c588607bf206d4ae3ef4ba1cdb3
2018-11-28 18:09:43 -05:00
Fraunhofer IIS FDK
619b24da33 [automerger skipped] Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cd am: 9cfaf0cd45
am: 07ed1f756b  -s ours

Change-Id: I5a31c35f9c4e78d76a932bf132b063424d5faf20
2018-11-28 13:58:59 -08:00
Fraunhofer IIS FDK
07ed1f756b Merge "Add sanity check for allowed LPD sampling rate." am: b8a384b0cd
am: 9cfaf0cd45

Change-Id: I0c9952fe8b16ae2e8d4cb80b30d63ba00e172b09
2018-11-28 13:40:48 -08:00
Fraunhofer IIS FDK
9cfaf0cd45 Merge "Add sanity check for allowed LPD sampling rate."
am: b8a384b0cd

Change-Id: Iedcbbbee9ffc6b27cbc2f114b110974320f9044b
2018-11-28 13:35:05 -08:00
Treehugger Robot
b8a384b0cd Merge "Add sanity check for allowed LPD sampling rate." 2018-11-28 21:21:41 +00:00
Fraunhofer IIS FDK
c6b4af4a6c Add sanity check for allowed LPD sampling rate.
Bug: 112662981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
2018-11-28 19:15:09 +00:00
Fraunhofer IIS FDK
455081951d Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd am: 36b3869e2c
am: 479cc5a6d4

Change-Id: I16208b14efe6ca87828ef031146efc89618b709b
2018-11-27 12:52:11 -08:00
Fraunhofer IIS FDK
479cc5a6d4 Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd
am: 36b3869e2c

Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f
2018-11-27 12:47:01 -08:00
Fraunhofer IIS FDK
36b3869e2c Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()."
am: 0695cff3dd

Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2
2018-11-27 12:38:58 -08:00
Treehugger Robot
0695cff3dd Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." 2018-11-27 20:26:33 +00:00
Fraunhofer IIS FDK
108e0da304 Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9 am: c580437d7c
am: 3a64e48ede

Change-Id: I72bc148447f38fdd6640dc7854d6905eff229807
2018-11-27 11:22:35 -08:00
Fraunhofer IIS FDK
3a64e48ede Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9
am: c580437d7c

Change-Id: Id8f177954c585644d0535a44560fa3923780a764
2018-11-27 11:13:30 -08:00
Fraunhofer IIS FDK
c580437d7c Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()."
am: 0a1e3b6ef9

Change-Id: I2469e802965d3d974ca09a8c911d0d26f09e6700
2018-11-27 11:04:20 -08:00
Treehugger Robot
0a1e3b6ef9 Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." 2018-11-27 18:44:28 +00:00
Fraunhofer IIS FDK
9fe830cef8 Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." am: 652432830a am: 692cb872b3
am: d555cedc95

Change-Id: I897a238cf28c21d36913f656a6f9bf9837d7e2c4
2018-11-27 10:18:11 -08:00
Fraunhofer IIS FDK
d555cedc95 Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." am: 652432830a
am: 692cb872b3

Change-Id: I04560b0c7b756b010cd4b929c74b6343adf53fcf
2018-11-27 10:14:02 -08:00
Fraunhofer IIS FDK
692cb872b3 Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()."
am: 652432830a

Change-Id: Ic2c58ee86f479f406d519418f52800618a6e80ff
2018-11-27 10:10:05 -08:00
Treehugger Robot
652432830a Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." 2018-11-27 17:55:22 +00:00
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
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