aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/master'Martin Storsjo2019-03-152-7/+11
|\
| * DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-121-4/+4
| |\ | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b
| | * Merge "Unify audio element loop abort criterion in ER syntax" into pi-devJean-Michel Trivi2018-10-011-7/+4
| | |\
| | | * Unify audio element loop abort criterion in ER syntaxFraunhofer IIS FDK2018-09-271-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891548 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
| | * | Always check whether given channel config is supported.Fraunhofer IIS FDK2018-09-281-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112660981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
| | * | Merge "Prevent bit buffer counter overflow." into pi-devJean-Michel Trivi2018-09-069-85/+91
| | |\ \
| | | * | Prevent bit buffer counter overflow.Fraunhofer IIS FDK2018-08-179-85/+91
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While long-term test we discovered a bit counter overflow in the bit buffer. The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call. The following patch completely removes the bit counter and all its obsolete functions. Bug: 112662184 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
| | * | Merge "Break audio element loop in case element_count becomes too large." ↵Jean-Michel Trivi2018-09-061-1/+24
| | |\ \ | | | | | | | | | | | | | | | into pi-dev
| | | * | Break audio element loop in case element_count becomes too large.Fraunhofer IIS FDK2018-09-051-1/+24
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 112891564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
| | * / Prevent overflow in concealment clipping checkFraunhofer IIS FDK2018-09-051-4/+4
| | |/ | | | | | | | | | | | | | | | Bug: 112890225 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
| * | Merge "Add QMF analysis band sanity check"Jean-Michel Trivi2019-02-011-3/+7
| |\ \
| | * | Add QMF analysis band sanity checkFraunhofer IIS FDK2019-01-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
* | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2019-01-2120-154/+188
|\| | |
| * | | Merge "Do not support channel configuration change within PCE"Jean-Michel Trivi2019-01-151-7/+1
| |\ \ \ | | |/ / | |/| |
| | * | Do not support channel configuration change within PCEFraunhofer IIS FDK2019-01-021-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I94bddad6c88148dd01fff0850e261d98ef691793
| * | | Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()Fraunhofer IIS FDK2019-01-031-3/+3
| |/ / | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ic106c4371c5ac17cb832c7d9db042bcc9d1e7a09
| * | Prevent energy overflow in acelp calc_period_factor()Fraunhofer IIS FDK2018-12-281-1/+1
| | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I5a28fcb09a1b0b0d1f8861642c64185937021154
| * | Skip CRC check when flushing or concealment is appliedFraunhofer IIS FDK2018-12-271-3/+5
| | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0f340eb0fe7f5ee8778a73fbe27199ba4915de70
| * | Apply sbrDecoder_Parse() function for all explict SBR elementsFraunhofer IIS FDK2018-12-271-8/+12
| | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I97471c4db309307a21100f1d5d88d3c4e24d2670
| * | 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-273-1/+8
| | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I9f9064fb63ac40e18f245c00b7375b4874f2925b
| * | 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()"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 "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 "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()"Jean-Michel Trivi2018-12-271-2/+2
| |\ \ \
| | * | | Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()Fraunhofer IIS FDK2018-12-261-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 112663384 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I5e41f1455ab35060c136abb7f4945fe9a545633c
| * / / Signed Integer Overflow in E_UTIL_preemph()Fraunhofer IIS FDK2018-12-264-3/+4
| |/ / | | | | | | | | | | | | | | | Bug: 112661356 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ibc7120aba3d357bfb8d751d80d99a6e0f51473e4
| * | DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li2018-12-1110-104/+122
| |\ \ | | | | | | | | | | | | | | | | Bug: 120502534 Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
| | * | Unify audio element loop abort criterion in ER syntaxFraunhofer IIS FDK2018-10-201-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891548 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392 (cherry picked from commit f2bc07da2ed70eb069f3faab1179c4c89792bf3d)
| | * | Always check whether given channel config is supported.Fraunhofer IIS FDK2018-10-201-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112660981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba (cherry picked from commit 25b209f229879a155759d791fe463b8abd283677)
| | * | Prevent bit buffer counter overflow.Fraunhofer IIS FDK2018-09-109-85/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While long-term test we discovered a bit counter overflow in the bit buffer. The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call. The following patch completely removes the bit counter and all its obsolete functions. Bug: 112662184 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7 (cherry picked from commit 15292f7e9620caf9e8df26a62efc2a2891ea822e)
| | * | Break audio element loop in case element_count becomes too large.Fraunhofer IIS FDK2018-09-101-1/+24
| | |/ | | | | | | | | | | | | | | | | | | Bug: 112891564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199 (cherry picked from commit 3347cfb91a7ecabf5800d72e936f04ce44752bf3)
| * | Integer overflow fix in InvMdctTransformLowDelay_fdk()Fraunhofer IIS FDK2018-11-281-3/+5
| | | | | | | | | | | | | | | | | | | | | Bug: 112892194 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I47fdb5b51afd8c588607bf206d4ae3ef4ba1cdb3
| * | Merge "Add sanity check for allowed LPD sampling rate."Treehugger Robot2018-11-281-2/+1
| |\ \
| | * | Add sanity check for allowed LPD sampling rate.Fraunhofer IIS FDK2018-11-281-2/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Bug: 112662981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896 Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
| * | Unsigned Integer Overflow in aacDecoder_DecodeFrame().Fraunhofer IIS FDK2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 112661742 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d
* | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-11-061-6/+7
|\| |
| * | Merge "Fix huffman decoder escape sequence length limitation."Treehugger Robot2018-11-051-5/+7
| |\ \
| | * | Fix huffman decoder escape sequence length limitation.Fraunhofer IIS FDK2018-11-051-5/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 112661753 Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601 Merged-In: 62623d8d797a3d7314834c59ebc785e738965635
* | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-10-161-1/+18
|\| |
| * | Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Fraunhofer IIS FDK2018-10-121-1/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type. While testing FDK in Android P DP3 x86 64bit emulator we observed a runtime error. The function parameter of the callback didn't use a typeless pointer. Following patch contains a revised sbr decoder callback function with explicit data type cast to be inline with all other callbacks in FDK. Bug: 112662306 Bug: 116075869 Test: on x86: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
* | Add tighter sanity checks in CBlock_GetEscapeMartin Storsjo2018-09-031-1/+2
| | | | | | | | | | | | | | | | | | We can't read 31 bits of value here, since that would place the topmost bit in the sign bit. Fixes: 3480/clusterfuzz-testcase-4573445423628288 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* | Initialize the transport decoder library with TPDEC_PARAM_IGNORE_BUFFERFULLNESSMartin Storsjo2018-09-031-0/+2
| | | | | | | | | | | | | | | | | | Prior to FDKv2, this was what the library used to do. This makes sure that the decoder actually decodes ADTS frames directly if feeding full ADTS frames to the decoder. Previously after FDKv2, the decoder would only start decoding ADTS frames after feeding a few frames.
* | Add an fdk_ prefix to t_qua_gain7bMartin Storsjo2018-09-023-4/+4
| | | | | | | | | | This fixes symbol collisions, if libfdk-aac and libopencore-amr are statically linked into the same binary.
* | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-09-0264-13273/+29918
|\|
| * Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()Fraunhofer IIS FDK2018-05-252-10/+12
| | | | | | | | | | | | Bug: 80314771 Test: play AAC content over 2GB Change-Id: If791305bf95680b945971f9dc5f58495cbf6c8cd