diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-18 17:36:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-18 17:36:28 +0000 |
| commit | 0af61b88eda3026cfe757bd91111539278295060 (patch) | |
| tree | b6d0472a69e816500d5ca7951620be20bc15f3d8 | |
| parent | d99aadd0d76b1c5d1baa30741a841010e1dcf5bf (diff) | |
| parent | a7c36cc207495967b4b31fbb86162860146281c6 (diff) | |
| download | fdk-aac-0af61b88eda3026cfe757bd91111539278295060.tar.gz fdk-aac-0af61b88eda3026cfe757bd91111539278295060.tar.bz2 fdk-aac-0af61b88eda3026cfe757bd91111539278295060.zip | |
Merge "Fix wrong input buffer feed for PS encoder at less input samples than framesize."
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 8a0819e..19546fc 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1784,8 +1784,8 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, hAacEncoder->nSamplesRead)); INT_PCM *pIn = hAacEncoder->inputBuffer + - (hAacEncoder->inputBufferOffset + hAacEncoder->nSamplesRead) / - hAacEncoder->aacConfig.nChannels; + hAacEncoder->inputBufferOffset / hAacEncoder->aacConfig.nChannels + + hAacEncoder->nSamplesRead / hAacEncoder->extParam.nChannels; newSamples -= (newSamples % hAacEncoder->extParam |