aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Extend PS concealment/error treatment" am: 58221178cc am: 45903f4e5aJean-Michel Trivi2018-12-282-1/+13
|\ | | | | | | | | | | am: 2f583c7ab7 Change-Id: Iab1ec22f37b66e777de5fa0d18aabc74f6408ae2
| * Merge "Extend PS concealment/error treatment" am: 58221178ccJean-Michel Trivi2018-12-282-1/+13
| |\ | | | | | | | | | | | | | | | am: 45903f4e5a Change-Id: I907fa44b6ab124f4b31a04212d06ff3e22cac567
| | * Merge "Extend PS concealment/error treatment"Jean-Michel Trivi2018-12-282-1/+13
| | |\ | | | | | | | | | | | | | | | | | | | | am: 58221178cc Change-Id: I6f810d8e9734607abc6a9d520959edc53fdf17d6
| | | * Merge "Extend PS concealment/error treatment"Jean-Michel Trivi2018-12-282-1/+13
| | | |\
| | | | * Extend PS concealment/error treatmentFraunhofer IIS FDK2018-12-272-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I19b87d33b1d0ed8b43b4ea57992f1c6df500d9f4
* | | | | Merge "Fix potential invalid memory access for concealment in ↵Jean-Michel Trivi2018-12-281-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decodeEnvelope()" am: 6acfe3b799 am: 3d9793633e am: 0cd0a834f6 Change-Id: Ibb76aaeeb9c8d3c844d41d9b60ce2949017af774
| * | | | Merge "Fix potential invalid memory access for concealment in ↵Jean-Michel Trivi2018-12-281-4/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decodeEnvelope()" am: 6acfe3b799 am: 3d9793633e Change-Id: Iba356069f8d51e6a2afd199f62b84867dd34902e
| | * | | Merge "Fix potential invalid memory access for concealment in decodeEnvelope()"Jean-Michel Trivi2018-12-281-4/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6acfe3b799 Change-Id: I076520b4a8a40ade304d22f0b0a408de3734ac9a
| | | * | Merge "Fix potential invalid memory access for concealment in decodeEnvelope()"Jean-Michel Trivi2018-12-281-4/+9
| | | |\|
| | | | * Fix potential invalid memory access for concealment in decodeEnvelope()Fraunhofer IIS FDK2018-12-271-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I916a24c000ef792aa3d5befa02a6b6f673161844
* | | | | Merge "Reset all noisefloor levels in leanSbrConcealment()" am: c19c36cbfc ↵Jean-Michel Trivi2018-12-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a129f9b266 am: f04d154c74 Change-Id: I12cbcb0284017c61ef25c8f31de62355fd4a354a
| * | | | Merge "Reset all noisefloor levels in leanSbrConcealment()" am: c19c36cbfcJean-Michel Trivi2018-12-281-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a129f9b266 Change-Id: I8362c86b61b9bcc69edb8015de14a287b9932f8f
| | * | | Merge "Reset all noisefloor levels in leanSbrConcealment()"Jean-Michel Trivi2018-12-281-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: c19c36cbfc Change-Id: I8db91269800f92a2ca679cceb66cd52605b1a24e
| | | * | Merge "Reset all noisefloor levels in leanSbrConcealment()"Jean-Michel Trivi2018-12-281-2/+2
| | | |\|
| | | | * Reset all noisefloor levels in leanSbrConcealment()Fraunhofer IIS FDK2018-12-271-2/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I6d25e8c8844bdf8e15d1aab695cb5d19d6b232e2
* | | | Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ↵Jean-Michel Trivi2018-12-2716-20/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecc96969d7 am: f5512132f3 am: d6459f539c Change-Id: I15844b575d276334d5a960a73cf556f5f82fcff3
| * | | Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7Jean-Michel Trivi2018-12-2716-20/+80
| |\| | | | | | | | | | | | | | | | | | | | | | am: f5512132f3 Change-Id: Ie01b6d6c881c4c9a52af921eee9f7ced6fd6880e
| | * | Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fbJean-Michel Trivi2018-12-2716-20/+80
| | |\| | | | | | | | | | | | | | | | | | | | | am: ecc96969d7 Change-Id: I588392116ecdf22e1266ec6fff8416fa87d911c4
| | | * Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fbJean-Michel Trivi2018-12-2716-20/+80
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * Apply sbrDecoder_Parse() function for all explict SBR elementsFraunhofer IIS FDK2018-12-272-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I97471c4db309307a21100f1d5d88d3c4e24d2670
| | | | * Call QMF transposer initialization only with successful SBR processingFraunhofer IIS FDK2018-12-273-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8a8626a83e1bd87b2c14fad7c90174e4172c01b6
| | | | * Add error path to generateFixFixOnly()Fraunhofer IIS FDK2018-12-271-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I1f1767403068a9eafd7b20edb96669b71b0110fc
| | | | * Add missing break in order to avoid a fallthrough in setConcealMethod()Fraunhofer IIS FDK2018-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I10da23ee81cfc48d4a67c25006e6fd48ed985c69
| | | | * Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warningsFraunhofer IIS FDK2018-12-2711-3/+41
| | | |/ | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I9f9064fb63ac40e18f245c00b7375b4874f2925b
* | | | Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16a ↵Jean-Michel Trivi2018-12-271-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2027969e1f am: cce1e2106d Change-Id: Ifeeb188cfd4bc57d7c40d102188614a3d61cc333
| * | | Merge "Limit too large shift exponent in apply_inter_tes()" am: f828d3e16aJean-Michel Trivi2018-12-271-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | am: 2027969e1f Change-Id: I1c13d0a0fbbeb5c937e3e1391f0974e5caf76a20
| | * | Merge "Limit too large shift exponent in apply_inter_tes()"Jean-Michel Trivi2018-12-271-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: f828d3e16a Change-Id: I09395e1536fc578de69e2bf365b6f344d41dda93
| | | * Merge "Limit too large shift exponent in apply_inter_tes()"Jean-Michel Trivi2018-12-271-2/+4
| | | |\
| | | | * Limit too large shift exponent in apply_inter_tes()Fraunhofer IIS FDK2018-12-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112892200 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I74e349ecb796343b475b825ac7d97497560a1e7a
* | | | | Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: ↵Jean-Michel Trivi2018-12-271-7/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfc6616048 am: 8b3ca08a7d am: d8be063322 Change-Id: Ie0637291a104ca68ef4e438e2d4a7d599088c6ba
| * | | | Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: ↵Jean-Michel Trivi2018-12-271-7/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfc6616048 am: 8b3ca08a7d Change-Id: I42d3b717bb324e560d5ae15265fa9f36d8eb0682
| | * | | Merge "Limit too large scale_change exponent used in adjustTimeSlot"Jean-Michel Trivi2018-12-271-7/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: cfc6616048 Change-Id: I4351d5a90fe317a803cd91da378b5d5584d46bc8
| | | * | Merge "Limit too large scale_change exponent used in adjustTimeSlot"Jean-Michel Trivi2018-12-271-7/+9
| | | |\ \ | | | | |/ | | | |/|
| | | | * Limit too large scale_change exponent used in adjustTimeSlotFraunhofer IIS FDK2018-12-271-7/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112892953 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I4fe66defb40a36612850582cb0f1da7fb07a8bed
* | | | Merge "Signed Integer Overflows in imlt_block()" am: 55930c28af am: 7d959f2f30Jean-Michel Trivi2018-12-271-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | am: 83ba3e096a Change-Id: I0805e8ba62c75a16c9df2d2169c79b8ddbd0974e
| * | | Merge "Signed Integer Overflows in imlt_block()" am: 55930c28afJean-Michel Trivi2018-12-271-6/+10
| |\| | | | | | | | | | | | | | | | | | | | | | am: 7d959f2f30 Change-Id: Iea1e4a89029523511bef926c98ee23e9bcb216fe
| | * | Merge "Signed Integer Overflows in imlt_block()"Jean-Michel Trivi2018-12-271-6/+10
| | |\| | | | | | | | | | | | | | | | | | | | | am: 55930c28af Change-Id: Ie1e1f5d57cd6a8bf0f56461ceef36d15b3dd0db6
| | | * Merge "Signed Integer Overflows in imlt_block()"Jean-Michel Trivi2018-12-271-6/+10
| | | |\
| | | | * Signed Integer Overflows in imlt_block()Fraunhofer IIS FDK2018-12-261-6/+10
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112890242 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I98fda0eea7f7223d76df31776c6723b618e5b581
* | | | Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17 ↵Jean-Michel Trivi2018-12-261-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ca0d8e7461 am: cafc42b5eb Change-Id: Icd717282e22dfb01b678836f0a50eb9b56db9f0f
| * | | Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17Jean-Michel Trivi2018-12-261-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | am: ca0d8e7461 Change-Id: Ia4e0396a4df14d667f80aded10631815b715e2c2
| | * | Merge "Unsigned Integer Overflow in InitSegmentBitfield()"Jean-Michel Trivi2018-12-261-1/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: 4899e80a17 Change-Id: I4cb328300795db2c02b5d4ab01f5e4c4aecd0117
| | | * Merge "Unsigned Integer Overflow in InitSegmentBitfield()"Jean-Michel Trivi2018-12-271-1/+4
| | | |\
| | | | * Unsigned Integer Overflow in InitSegmentBitfield()Fraunhofer IIS FDK2018-12-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112662995 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ida3b1d49dc35a03a3ff02f6e150cfb55e9e1da11
* | | | | Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84 am: ↵Jean-Michel Trivi2018-12-261-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a98beef0cf am: d145d90619 Change-Id: Ic018092c0fc9f5f2ec422f29f1323ed514b53803
| * | | | Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84Jean-Michel Trivi2018-12-261-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a98beef0cf Change-Id: Ie8198a53d1666d97ae586c9984b8ffcdb6c528c7
| | * | | Merge "Encoder returned an error while explicit flushing"Jean-Michel Trivi2018-12-261-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2f5612ef84 Change-Id: I5cab81980db628f6f4cbe9f0a8bf92d3dd2e76a5
| | | * | Merge "Encoder returned an error while explicit flushing"Jean-Michel Trivi2018-12-271-3/+4
| | | |\ \
| | | | * | Encoder returned an error while explicit flushingFraunhofer IIS FDK2018-12-261-3/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112663571 Test: atest EncoderTest Change-Id: Ieaaaf2c32786a8344ba912f4587298654d508e67
* | | | | Merge "Unsigned Integer Overflow in ↵Jean-Michel Trivi2018-12-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931 am: 466adf2a1b am: d07eeb453f Change-Id: Id09444e5b08161f79053c09e42d686551a2b05e5