Commit Graph

92 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK b6c47c51b2 Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2 am: 196f1ce484
am: b29fd0db45

Change-Id: Ic3acadc0a8a48485b96075882eebfd867cfc709e
2018-12-29 06:25:51 -08:00
Fraunhofer IIS FDK b29fd0db45 Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2
am: 196f1ce484

Change-Id: I4bcc2e7ff145bffb7f11a090e8a048e9c2d11d76
2018-12-29 06:16:43 -08:00
Fraunhofer IIS FDK f4fc574fdd Prevent energy overflow in acelp calc_period_factor()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I5a28fcb09a1b0b0d1f8861642c64185937021154
2018-12-28 19:42:49 -05:00
Jean-Michel Trivi d00da81a1d Merge "Skip CRC check when flushing or concealment is applied" am: 385764944d am: 7c9f1165e7
am: 7b664f0bea

Change-Id: I205000a7dd682df83dff15afbd35772ed7c14a0f
2018-12-28 15:24:40 -08:00
Jean-Michel Trivi 7b664f0bea Merge "Skip CRC check when flushing or concealment is applied" am: 385764944d
am: 7c9f1165e7

Change-Id: Ia818ae31a012d18cefad45ea969123d09ff6e31a
2018-12-28 15:19:17 -08:00
Fraunhofer IIS FDK 0ca9742ad2 Skip CRC check when flushing or concealment is applied
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0f340eb0fe7f5ee8778a73fbe27199ba4915de70
2018-12-27 17:55:50 -05:00
Jean-Michel Trivi 55efc0ade2 Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7 am: f5512132f3
am: d6459f539c

Change-Id: I15844b575d276334d5a960a73cf556f5f82fcff3
2018-12-27 14:49:05 -08:00
Jean-Michel Trivi d6459f539c Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7
am: f5512132f3

Change-Id: Ie01b6d6c881c4c9a52af921eee9f7ced6fd6880e
2018-12-27 14:39:49 -08:00
Fraunhofer IIS FDK 0cebd077b6 Apply sbrDecoder_Parse() function for all explict SBR elements
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I97471c4db309307a21100f1d5d88d3c4e24d2670
2018-12-27 14:51:52 -05:00
Fraunhofer IIS FDK 8f5b1e47d6 Add missing break in order to avoid a fallthrough in setConcealMethod()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I10da23ee81cfc48d4a67c25006e6fd48ed985c69
2018-12-27 14:39:43 -05:00
Fraunhofer IIS FDK 64134e60b3 Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warnings
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I9f9064fb63ac40e18f245c00b7375b4874f2925b
2018-12-27 14:17:51 -05:00
Jean-Michel Trivi 61b3c49df0 Merge "Signed Integer Overflows in imlt_block()" am: 55930c28af am: 7d959f2f30
am: 83ba3e096a

Change-Id: I0805e8ba62c75a16c9df2d2169c79b8ddbd0974e
2018-12-27 09:36:33 -08:00
Jean-Michel Trivi 83ba3e096a Merge "Signed Integer Overflows in imlt_block()" am: 55930c28af
am: 7d959f2f30

Change-Id: Iea1e4a89029523511bef926c98ee23e9bcb216fe
2018-12-27 09:31:32 -08:00
Jean-Michel Trivi 437b7440d1 Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17 am: ca0d8e7461
am: cafc42b5eb

Change-Id: Icd717282e22dfb01b678836f0a50eb9b56db9f0f
2018-12-26 18:53:44 -08:00
Jean-Michel Trivi cafc42b5eb Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17
am: ca0d8e7461

Change-Id: Ia4e0396a4df14d667f80aded10631815b715e2c2
2018-12-26 18:35:45 -08:00
Jean-Michel Trivi 58600c035a Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931 am: 466adf2a1b
am: d07eeb453f

Change-Id: Id09444e5b08161f79053c09e42d686551a2b05e5
2018-12-26 18:19:25 -08:00
Jean-Michel Trivi 3f50499c9c Merge "Prevent overflow in usac filters" am: 4053380094 am: eaad782db3
am: 18d4dcf255

Change-Id: Id1736dd6af5b656c158896f6d9fcb117231351a4
2018-12-26 18:18:55 -08:00
Jean-Michel Trivi 0694a4e1e8 Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6 am: 8879fb1fd6
am: 350e4ffea2

Change-Id: I5f6e1d37824f13d791edd8433aac9c591bbfc399
2018-12-26 18:18:35 -08:00
Fraunhofer IIS FDK fa8a80d890 Signed Integer Overflows in imlt_block()
Bug: 112890242
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I98fda0eea7f7223d76df31776c6723b618e5b581
2018-12-26 21:15:07 -05:00
Jean-Michel Trivi 4899e80a17 Merge "Unsigned Integer Overflow in InitSegmentBitfield()" 2018-12-27 02:10:25 +00:00
Jean-Michel Trivi d07eeb453f Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931
am: 466adf2a1b

Change-Id: I354fe7ee0401e1e154ae42ce9a80672db8a84d08
2018-12-26 18:08:21 -08:00
Jean-Michel Trivi 18d4dcf255 Merge "Prevent overflow in usac filters" am: 4053380094
am: eaad782db3

Change-Id: I86ee269643f3247138c71ffe88a2a589bfce0357
2018-12-26 18:07:50 -08:00
Jean-Michel Trivi 350e4ffea2 Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6
am: 8879fb1fd6

Change-Id: I955c6e7d250ac52986aeb0879dad976dd62d3fab
2018-12-26 18:07:32 -08:00
Jean-Michel Trivi a5cf260931 Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" 2018-12-27 01:58:50 +00:00
Jean-Michel Trivi 4053380094 Merge "Prevent overflow in usac filters" 2018-12-27 01:54:49 +00:00
Jean-Michel Trivi 3bb4fe68a6 Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" 2018-12-27 01:51:53 +00:00
Jean-Michel Trivi 2ddc635e1d Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50 am: b471c2c215
am: f69ca4c614

Change-Id: I78ee4dccc649e0ff2ee4006212795d89c2f8233c
2018-12-26 17:10:27 -08:00
Jean-Michel Trivi f69ca4c614 Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50
am: b471c2c215

Change-Id: Ib6f14a5f7b33ffb8bce1a9b37531c0872eeceb2e
2018-12-26 17:06:27 -08:00
Fraunhofer IIS FDK 950d8efb1a Unsigned Integer Overflow in InitSegmentBitfield()
Bug: 112662995
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ida3b1d49dc35a03a3ff02f6e150cfb55e9e1da11
2018-12-26 19:45:18 -05:00
Fraunhofer IIS FDK 512898b298 Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()
Bug: 112661610
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I96e2c10328fec8fd12f9c752904860b87a72bed2
2018-12-26 19:39:27 -05:00
Fraunhofer IIS FDK 8166502969 Prevent overflow in usac filters
Bug: 112663886
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie7af65a1a556afb141ea5272f70bfea11881ac30
2018-12-26 19:19:34 -05:00
Fraunhofer IIS FDK 1450575edf Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()
Bug: 112663384
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I5e41f1455ab35060c136abb7f4945fe9a545633c
2018-12-26 18:42:14 -05:00
Fraunhofer IIS FDK 9edc5864fa Signed Integer Overflow in E_UTIL_preemph()
Bug: 112661356
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ibc7120aba3d357bfb8d751d80d99a6e0f51473e4
2018-12-26 18:20:17 -05:00
Xin Li 20c336953f DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
2018-12-11 13:59:07 -08:00
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 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 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
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 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 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 a16b4cba47 Merge "Fix huffman decoder escape sequence length limitation." am: a4d6ca7b07
am: ac56cddd1f

Change-Id: I422463f26359bef0ad3220c9324ceb26fcd1da14
2018-11-05 15:14:17 -08:00
Treehugger Robot a4d6ca7b07 Merge "Fix huffman decoder escape sequence length limitation." 2018-11-05 22:58:33 +00:00
Fraunhofer IIS FDK f90be06503 Fix huffman decoder escape sequence length limitation.
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 112661753

Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601
Merged-In: 62623d8d79
2018-11-05 14:43:14 -05: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 f2bc07da2e)
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 25b209f229)
2018-10-20 00:16:57 +00: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
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 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