diff options
author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2020-04-17 15:11:03 +0200 |
---|---|---|
committer | Ray Essick <essick@google.com> | 2021-02-14 12:23:38 -0800 |
commit | edab3e30d68dc47ad8e4fabcca78b62dbd930d4c (patch) | |
tree | 0ad4ea425df1b99df3b896e1fbc74a557b472491 /libSBRenc/src/sbr_encoder.cpp | |
parent | 4fbc97cc479704a5e12d2d3c0d2b782cf21595a3 (diff) | |
download | fdk-aac-edab3e30d68dc47ad8e4fabcca78b62dbd930d4c.tar.gz fdk-aac-edab3e30d68dc47ad8e4fabcca78b62dbd930d4c.tar.bz2 fdk-aac-edab3e30d68dc47ad8e4fabcca78b62dbd930d4c.zip |
Overcome SBR encoder coupling quality issue in ELD.
Bug 177604812
Test: see SBR/PS encoder
Change-Id: Ie7b9f8d1dec3708557d1e1189d45bc0e3bf5444c
Diffstat (limited to 'libSBRenc/src/sbr_encoder.cpp')
-rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index df9e996..9f1ede2 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1450,8 +1450,6 @@ static INT initEnvChannel(HANDLE_SBR_CONFIG_DATA sbrConfigData, params->deltaTAcrossFrames, 0, 0)) return (1); - sbrConfigData->initAmpResFF = params->init_amp_res_FF; - if (FDKsbrEnc_InitSbrHuffmanTables(&hEnv->encEnvData, &hEnv->sbrCodeEnvelope, &hEnv->sbrCodeNoiseFloor, sbrHeaderData->sbr_amp_res)) @@ -1749,6 +1747,7 @@ static INT FDKsbrEnc_EnvInit(HANDLE_SBR_ELEMENT hSbrElement, hSbrElement->sbrHeaderData.sbr_data_extra = 1; hSbrElement->sbrHeaderData.sbr_amp_res = (AMP_RES)params->amp_res; + hSbrElement->sbrConfigData.initAmpResFF = params->init_amp_res_FF; /* header_extra_1 */ hSbrElement->sbrHeaderData.freqScale = params->freqScale; |