aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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: 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: 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: 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 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: 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: 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: 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 Change-Id: I354fe7ee0401e1e154ae42ce9a80672db8a84d08
| * | | Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"Jean-Michel Trivi2018-12-261-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: a5cf260931 Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3
| | * | Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()"Jean-Michel Trivi2018-12-271-1/+1
| | |\ \
| | | * | Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()Fraunhofer IIS FDK2018-12-261-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112661610 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I96e2c10328fec8fd12f9c752904860b87a72bed2
* | | | Merge "Improve error robustness in arithmetic decoder" am: ecdec651daJean-Michel Trivi2018-12-261-3/+11
|\| | | | | | | | | | | | | | | | | | | | | | | am: 485d02df73 Change-Id: Ied4097f663ac0aeee589fe9a1ee3bb7cf8245219
| * | | Merge "Improve error robustness in arithmetic decoder"Jean-Michel Trivi2018-12-261-3/+11
| |\| | | | | | | | | | | | | | | | | | | | | | am: ecdec651da Change-Id: I8e119ac863c88ba9e341716a48ae2717cffe5ae5
| | * | Merge "Improve error robustness in arithmetic decoder"Jean-Michel Trivi2018-12-271-3/+11
| | |\ \
| | | * | Improve error robustness in arithmetic decoderFraunhofer IIS FDK2018-12-261-3/+11
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112663564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I3025adbf308bf510dc5bdc1d70c58979fb182187
* | | | Merge "Prevent overflow in usac filters" am: 4053380094Jean-Michel Trivi2018-12-263-10/+9
|\| | | | | | | | | | | | | | | | | | | | | | | am: eaad782db3 Change-Id: I86ee269643f3247138c71ffe88a2a589bfce0357
| * | | Merge "Prevent overflow in usac filters"Jean-Michel Trivi2018-12-263-10/+9
| |\| | | | | | | | | | | | | | | | | | | | | | am: 4053380094 Change-Id: If0b450840199cde16e10e9a7911c7a8d331b7caa
| | * | Merge "Prevent overflow in usac filters"Jean-Michel Trivi2018-12-273-10/+9
| | |\ \
| | | * | Prevent overflow in usac filtersFraunhofer IIS FDK2018-12-263-10/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112663886 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie7af65a1a556afb141ea5272f70bfea11881ac30
* | | | Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6Jean-Michel Trivi2018-12-261-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | am: 8879fb1fd6 Change-Id: I955c6e7d250ac52986aeb0879dad976dd62d3fab
| * | | Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()"Jean-Michel Trivi2018-12-261-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | am: 3bb4fe68a6 Change-Id: Ic2b61ea47ab9fd393c0528bc64954412f759c135