1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-23 22:17:38 +01:00

633 Commits

Author SHA1 Message Date
Jean-Michel Trivi
3f809494b1 Merge "Extend PS concealment/error treatment" am: 58221178cc am: 45903f4e5a
am: 2f583c7ab7

Change-Id: Iab1ec22f37b66e777de5fa0d18aabc74f6408ae2
2018-12-28 15:23:57 -08:00
Jean-Michel Trivi
762902309e Merge "Fix potential invalid memory access for concealment in decodeEnvelope()" am: 6acfe3b799 am: 3d9793633e
am: 0cd0a834f6

Change-Id: Ibb76aaeeb9c8d3c844d41d9b60ce2949017af774
2018-12-28 15:23:41 -08:00
Jean-Michel Trivi
a228b624b5 Merge "Reset all noisefloor levels in leanSbrConcealment()" am: c19c36cbfc am: a129f9b266
am: f04d154c74

Change-Id: I12cbcb0284017c61ef25c8f31de62355fd4a354a
2018-12-28 15:23:25 -08:00
Jean-Michel Trivi
2f583c7ab7 Merge "Extend PS concealment/error treatment" am: 58221178cc
am: 45903f4e5a

Change-Id: I907fa44b6ab124f4b31a04212d06ff3e22cac567
2018-12-28 15:18:13 -08:00
Jean-Michel Trivi
0cd0a834f6 Merge "Fix potential invalid memory access for concealment in decodeEnvelope()" am: 6acfe3b799
am: 3d9793633e

Change-Id: Iba356069f8d51e6a2afd199f62b84867dd34902e
2018-12-28 15:17:50 -08:00
Jean-Michel Trivi
f04d154c74 Merge "Reset all noisefloor levels in leanSbrConcealment()" am: c19c36cbfc
am: a129f9b266

Change-Id: I8362c86b61b9bcc69edb8015de14a287b9932f8f
2018-12-28 15:17:25 -08:00
Jean-Michel Trivi
45903f4e5a Merge "Extend PS concealment/error treatment"
am: 58221178cc

Change-Id: I6f810d8e9734607abc6a9d520959edc53fdf17d6
2018-12-28 15:11:47 -08:00
Jean-Michel Trivi
3d9793633e Merge "Fix potential invalid memory access for concealment in decodeEnvelope()"
am: 6acfe3b799

Change-Id: I076520b4a8a40ade304d22f0b0a408de3734ac9a
2018-12-28 15:11:34 -08:00
Jean-Michel Trivi
a129f9b266 Merge "Reset all noisefloor levels in leanSbrConcealment()"
am: c19c36cbfc

Change-Id: I8db91269800f92a2ca679cceb66cd52605b1a24e
2018-12-28 15:11:18 -08:00
Jean-Michel Trivi
58221178cc Merge "Extend PS concealment/error treatment" 2018-12-28 23:03:55 +00:00
Jean-Michel Trivi
6acfe3b799 Merge "Fix potential invalid memory access for concealment in decodeEnvelope()" 2018-12-28 23:03:46 +00:00
Jean-Michel Trivi
c19c36cbfc Merge "Reset all noisefloor levels in leanSbrConcealment()" 2018-12-28 23:03:33 +00: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
55d2c9582a Extend PS concealment/error treatment
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I19b87d33b1d0ed8b43b4ea57992f1c6df500d9f4
2018-12-27 17:31:46 -05:00
Fraunhofer IIS FDK
82383e3212 Fix potential invalid memory access for concealment in decodeEnvelope()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I916a24c000ef792aa3d5befa02a6b6f673161844
2018-12-27 17:28:39 -05:00
Jean-Michel Trivi
f5512132f3 Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
am: ecc96969d7

Change-Id: I588392116ecdf22e1266ec6fff8416fa87d911c4
2018-12-27 14:28:38 -08:00
Fraunhofer IIS FDK
5cb1030d72 Reset all noisefloor levels in leanSbrConcealment()
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I6d25e8c8844bdf8e15d1aab695cb5d19d6b232e2
2018-12-27 17:25:13 -05:00
Jean-Michel Trivi
ecc96969d7 Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
* changes:
  Apply sbrDecoder_Parse() function for all explict SBR elements
  Call QMF transposer initialization only with successful SBR processing
  Add error path to generateFixFixOnly()
  Add missing break in order to avoid a fallthrough in setConcealMethod()
  Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warnings
2018-12-27 22:18:54 +00: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
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