Commit Graph

800 Commits

Author SHA1 Message Date
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 61b5f49362 Merge "Add valid bits check to adts header parser" am: b622299482
am: ffb999bec4

Change-Id: I9769e9e7152cc5294f3b1a925487938803f40878
2018-12-28 15:19:34 -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
Jean-Michel Trivi ccbdcbecd0 Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7b
am: e9e770ba71

Change-Id: Iff794b79659de4e4ce552b4ecb5c171b3f959faa
2018-12-28 15:18:56 -08:00
Jean-Michel Trivi d93de565ac Merge "Setup lowdelay SBR LFE element via SBR callback" am: 3e0a7a40c5
am: 7e454bd098

Change-Id: Ida1f2655913afe2f16b3efd9464b2c7027732d17
2018-12-28 15:18:34 -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 ffb999bec4 Merge "Add valid bits check to adts header parser"
am: b622299482

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

Change-Id: Ia9cd7ecef842760c4a249fce51522bc9afef4d47
2018-12-28 15:12:32 -08:00
Jean-Michel Trivi e9e770ba71 Merge "Fix element list in channel_configuration_14 description"
am: 83e30f0f7b

Change-Id: Ifb41f345377985c17a23847a218193cfc09708ea
2018-12-28 15:12:15 -08:00
Jean-Michel Trivi 7e454bd098 Merge "Setup lowdelay SBR LFE element via SBR callback"
am: 3e0a7a40c5

Change-Id: I254336ec48ef2b95188a52b7f5377f7c84071944
2018-12-28 15:12:00 -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 b622299482 Merge "Add valid bits check to adts header parser" 2018-12-28 23:04:36 +00:00
Jean-Michel Trivi 385764944d Merge "Skip CRC check when flushing or concealment is applied" 2018-12-28 23:04:26 +00:00
Jean-Michel Trivi 83e30f0f7b Merge "Fix element list in channel_configuration_14 description" 2018-12-28 23:04:16 +00:00
Jean-Michel Trivi 3e0a7a40c5 Merge "Setup lowdelay SBR LFE element via SBR callback" 2018-12-28 23:04:06 +00: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
Fraunhofer IIS FDK 5877c3e959 Add valid bits check to adts header parser
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I72509e3afbc4c7e5a3a6fe877edd4eed832d7204
2018-12-27 17:59:01 -05: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
Fraunhofer IIS FDK b8467f6d32 Fix element list in channel_configuration_14 description
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I3d14ba2ed2af0eedc2bba5bc9248fe3dd1367a22
2018-12-27 17:52:10 -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 3cc09916b0 Setup lowdelay SBR LFE element via SBR callback
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I76ed994be312b6e718591db129e84b6be8ab214d
2018-12-27 17:34:06 -05: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