diff options
| author | Xin Li <delphij@google.com> | 2021-08-14 06:31:12 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-08-14 06:31:12 +0000 |
| commit | a950cd990528f07b93cc5af48145e7cb6bfeb3ca (patch) | |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libSBRenc/src/sbr_encoder.cpp | |
| parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
| parent | dcb2d8bd81e4f71007abed9bc89d67580a56b93a (diff) | |
| download | fdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.tar.gz fdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.tar.bz2 fdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.zip | |
Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9
Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
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 c1e083f..c3da072 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; |