Commit Graph

816 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK 0271d6a6f3 Call QMF transposer initialization only with successful SBR processing
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I8a8626a83e1bd87b2c14fad7c90174e4172c01b6
2018-12-27 14:48:15 -05:00
Fraunhofer IIS FDK 804f41ac64 Add error path to generateFixFixOnly()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I1f1767403068a9eafd7b20edb96669b71b0110fc
2018-12-27 14:45:29 -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
Jean-Michel Trivi 207025dc96 Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16a am: 2027969e1f
am: cce1e2106d

Change-Id: Ifeeb188cfd4bc57d7c40d102188614a3d61cc333
2018-12-27 11:32:48 -08:00
Jean-Michel Trivi ceafe133b4 Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: cfc6616048 am: 8b3ca08a7d
am: d8be063322

Change-Id: Ie0637291a104ca68ef4e438e2d4a7d599088c6ba
2018-12-27 11:32:30 -08:00
Jean-Michel Trivi cce1e2106d Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16a
am: 2027969e1f

Change-Id: I1c13d0a0fbbeb5c937e3e1391f0974e5caf76a20
2018-12-27 11:28:53 -08:00
Jean-Michel Trivi d8be063322 Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: cfc6616048
am: 8b3ca08a7d

Change-Id: I42d3b717bb324e560d5ae15265fa9f36d8eb0682
2018-12-27 11:28:29 -08:00
Jean-Michel Trivi 2027969e1f Merge "Limit too large shift exponent in apply_inter_tes()"
am: f828d3e16a

Change-Id: I09395e1536fc578de69e2bf365b6f344d41dda93
2018-12-27 11:24:20 -08:00
Jean-Michel Trivi 8b3ca08a7d Merge "Limit too large scale_change exponent used in adjustTimeSlot"
am: cfc6616048

Change-Id: I4351d5a90fe317a803cd91da378b5d5584d46bc8
2018-12-27 11:24:04 -08: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 f828d3e16a Merge "Limit too large shift exponent in apply_inter_tes()" 2018-12-27 19:14:22 +00:00
Jean-Michel Trivi cfc6616048 Merge "Limit too large scale_change exponent used in adjustTimeSlot" 2018-12-27 19:12:49 +00:00
Fraunhofer IIS FDK 29b81acd78 Limit too large shift exponent in apply_inter_tes()
Bug: 112892200
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I74e349ecb796343b475b825ac7d97497560a1e7a
2018-12-27 12:45:31 -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
Fraunhofer IIS FDK e93cd75ea4 Limit too large scale_change exponent used in adjustTimeSlot
Bug: 112892953
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I4fe66defb40a36612850582cb0f1da7fb07a8bed
2018-12-27 12:29:27 -05:00
Jean-Michel Trivi 7d959f2f30 Merge "Signed Integer Overflows in imlt_block()"
am: 55930c28af

Change-Id: Ie1e1f5d57cd6a8bf0f56461ceef36d15b3dd0db6
2018-12-27 09:26:34 -08:00
Jean-Michel Trivi 55930c28af Merge "Signed Integer Overflows in imlt_block()" 2018-12-27 17:18:44 +00: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 6a506100ee Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84 am: a98beef0cf
am: d145d90619

Change-Id: Ic018092c0fc9f5f2ec422f29f1323ed514b53803
2018-12-26 18:45:13 -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 d145d90619 Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84
am: a98beef0cf

Change-Id: Ie8198a53d1666d97ae586c9984b8ffcdb6c528c7
2018-12-26 18:31:39 -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 f87befcf3b Merge "Improve error robustness in arithmetic decoder" am: ecdec651da am: 485d02df73
am: 0f7ae8601c

Change-Id: I65666dfc9df6d4d7cda7b3c2781171e16170ff77
2018-12-26 18:19:10 -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 ca0d8e7461 Merge "Unsigned Integer Overflow in InitSegmentBitfield()"
am: 4899e80a17

Change-Id: I4cb328300795db2c02b5d4ab01f5e4c4aecd0117
2018-12-26 18:18:36 -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 a98beef0cf Merge "Encoder returned an error while explicit flushing"
am: 2f5612ef84

Change-Id: I5cab81980db628f6f4cbe9f0a8bf92d3dd2e76a5
2018-12-26 18:14:05 -08: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 0f7ae8601c Merge "Improve error robustness in arithmetic decoder" am: ecdec651da
am: 485d02df73

Change-Id: Ied4097f663ac0aeee589fe9a1ee3bb7cf8245219
2018-12-26 18:08:05 -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 466adf2a1b Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"
am: a5cf260931

Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3
2018-12-26 18:03:27 -08:00
Jean-Michel Trivi 2f5612ef84 Merge "Encoder returned an error while explicit flushing" 2018-12-27 02:01:43 +00:00
Jean-Michel Trivi 485d02df73 Merge "Improve error robustness in arithmetic decoder"
am: ecdec651da

Change-Id: I8e119ac863c88ba9e341716a48ae2717cffe5ae5
2018-12-26 17:59:55 -08:00
Jean-Michel Trivi eaad782db3 Merge "Prevent overflow in usac filters"
am: 4053380094

Change-Id: If0b450840199cde16e10e9a7911c7a8d331b7caa
2018-12-26 17:59:40 -08:00
Jean-Michel Trivi 8879fb1fd6 Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()"
am: 3bb4fe68a6

Change-Id: Ic2b61ea47ab9fd393c0528bc64954412f759c135
2018-12-26 17:59:23 -08:00
Jean-Michel Trivi a5cf260931 Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" 2018-12-27 01:58:50 +00:00
Jean-Michel Trivi ecdec651da Merge "Improve error robustness in arithmetic decoder" 2018-12-27 01:56:21 +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 1308fe1b8b Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases" am: 27894057af am: 86d12efb92
am: 232d000173

Change-Id: I8164d1fc45f82e359087b99de3e76fc9687dae31
2018-12-26 17:10:13 -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
Jean-Michel Trivi 232d000173 Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases" am: 27894057af
am: 86d12efb92

Change-Id: I61e1f526eccf8c6cdf428058ba7b1da4ae2f9a80
2018-12-26 17:06:09 -08:00
Jean-Michel Trivi b471c2c215 Merge "Signed Integer Overflow in E_UTIL_preemph()"
am: aea2558c50

Change-Id: Ic9581dc891f10677dc7be6d4050d24cf57ca4541
2018-12-26 17:02:23 -08:00
Jean-Michel Trivi 86d12efb92 Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases"
am: 27894057af

Change-Id: I8b0c317c7eac2ad8590a4c640414c20de448153b
2018-12-26 17:02:06 -08:00
Jean-Michel Trivi aea2558c50 Merge "Signed Integer Overflow in E_UTIL_preemph()" 2018-12-27 00:57:22 +00:00