1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-10 21:10:04 +01:00

502 Commits

Author SHA1 Message Date
Jean-Michel Trivi
f5512132f3 Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
am: ecc96969d7

Change-Id: I588392116ecdf22e1266ec6fff8416fa87d911c4
2018-12-27 14:28:38 -08: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
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
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
ca0d8e7461 Merge "Unsigned Integer Overflow in InitSegmentBitfield()"
am: 4899e80a17

Change-Id: I4cb328300795db2c02b5d4ab01f5e4c4aecd0117
2018-12-26 18:18:36 -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
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
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
Jean-Michel Trivi
27894057af Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases" 2018-12-27 00:55:34 +00:00
Fraunhofer IIS FDK
2aa9167aa6 Encoder returned an error while explicit flushing
Bug: 112663571
Test: atest EncoderTest

Change-Id: Ieaaaf2c32786a8344ba912f4587298654d508e67
2018-12-26 19:50:13 -05: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
48a4bca8b3 Improve error robustness in arithmetic decoder
Bug: 112663564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3025adbf308bf510dc5bdc1d70c58979fb182187
2018-12-26 19:34:16 -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
Fraunhofer IIS FDK
edbb4b0a14 Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases
Bug: 112661911
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I16e522c975ad45ff8d47d4cabe44f1f2bf95b73b
2018-12-26 18:17:27 -05:00
Jean-Michel Trivi
24f0dd93fe Merge "UBSAN overflow in FFT"
am: f59fd73d44

Change-Id: I19c7c9e9891fb4b06cb171c4c32e9f9d399bdf1c
2018-12-26 15:00:42 -08:00
Jean-Michel Trivi
11e6511470 Merge "Unsigned Integer Overflow in transportDec_readHeader()."
am: 93e981d1e1

Change-Id: Ie5ec825c876398813882e40f100a6d9d9ddfcc9f
2018-12-26 15:00:30 -08:00
Jean-Michel Trivi
f59fd73d44 Merge "UBSAN overflow in FFT" 2018-12-26 22:57:01 +00:00
Jean-Michel Trivi
0102aec77e Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()."
am: 7f3b4de053

Change-Id: I129ac675f560590ff1a082cc701a77ae173da707
2018-12-26 14:56:29 -08:00
Jean-Michel Trivi
93e981d1e1 Merge "Unsigned Integer Overflow in transportDec_readHeader()." 2018-12-26 22:54:00 +00:00
Jean-Michel Trivi
7f3b4de053 Merge "Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit()." 2018-12-26 22:51:50 +00:00
Fraunhofer IIS FDK
bef1b4dd96 UBSAN overflow in FFT
An overflow in the fft was observed for certain configurations. The root cause was in the scaling of the fft input data in dct_IV and dst_IV.
The following patch revises the scaling in dct and removes the unused arm implementation.

Bug: 112661057
Bug: 109936783
Bug: 112022208
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Idc9c44a9755b8151d5c7d8107696f43ac592413b
2018-12-26 16:09:37 -05:00
Fraunhofer IIS FDK
81933bc6eb Unsigned Integer Overflow in transportDec_readHeader().
Bug: 112662270
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0beedab38175fc57e5bd9eb5700a3850ef2bebf7
2018-12-26 15:35:51 -05:00
Jean-Michel Trivi
d200c4e938 Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()."
am: e8b5674a5f

Change-Id: I4bb66aafb39f6d7321c2fa3f1fcc0fec0432ff26
2018-12-26 12:12:30 -08:00
Jean-Michel Trivi
e8b5674a5f Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()." 2018-12-26 20:05:14 +00:00