fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-30 23:45:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge "Setup lowdelay SBR LFE element via SBR callback" am: 3e0a7a40c5

Browse Source 
am: 7e454bd098

Change-Id: Ida1f2655913afe2f16b3efd9464b2c7027732d17
This commit is contained in:
Jean-Michel Trivi 2018-12-28 15:18:34 -08:00 committed by android-build-merger
commit d93de565ac
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libMpegTPDec/src/tpdec_asc.cpp
View File

@ -1300,7 +1300,11 @@ static INT ld_sbr_header(CSAudioSpecificConfig *asc, const INT dsFactor,
/* read elements of the passed channel_configuration until there is ID_NONE */
while ((element = channel_configuration_array[channelConfiguration][j]) !=
ID_NONE) {
if (element == ID_SCE || element == ID_CPE) {
/* Setup LFE element for upsampling too. This is essential especially for
* channel configs where the LFE element is not at the last position for
* example in channel config 13 or 14. It leads to memory leaks if the setup
* of the LFE element would be done later in the core. */
if (element == ID_SCE || element == ID_CPE || element == ID_LFE) {
error |= cb->cbSbr(
cb->cbSbrData, hBs, asc->m_samplingFrequency / dsFactor,
asc->m_extensionSamplingFrequency / dsFactor,