diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-18 17:36:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-18 17:36:32 +0000 |
| commit | a6f058fbac6f06a70316c0dfc2b46a172aee96fd (patch) | |
| tree | eb0919b1d98ec71cb1424b8244acff9fd2b4ec00 | |
| parent | 0af61b88eda3026cfe757bd91111539278295060 (diff) | |
| parent | 91ec65f7c82b202df559384e0844780bb9d80318 (diff) | |
| download | fdk-aac-a6f058fbac6f06a70316c0dfc2b46a172aee96fd.tar.gz fdk-aac-a6f058fbac6f06a70316c0dfc2b46a172aee96fd.tar.bz2 fdk-aac-a6f058fbac6f06a70316c0dfc2b46a172aee96fd.zip | |
Merge "Fix input buffer flushing for PS encoder."
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 19546fc..caa62c5 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1827,12 +1827,13 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, /* clear out until end-of-buffer */ if (nZeros) { + INT_PCM *pIn = + hAacEncoder->inputBuffer + + hAacEncoder->inputBufferOffset / + hAacEncoder->aacConfig.nChannels + + hAacEncoder->nSamplesRead / hAacEncoder->extParam.nChannels; for (i = 0; i < (int)hAacEncoder->extParam.nChannels; i++) { - FDKmemclear(hAacEncoder->inputBuffer + - i * hAacEncoder->inputBufferSizePerChannel + - (hAacEncoder->inputBufferOffset + - hAacEncoder->nSamplesRead) / - hAacEncoder->extParam.nChannels, + FDKmemclear(pIn + i * hAacEncoder->inputBufferSizePerChannel, sizeof(INT_PCM) * nZeros); } hAacEncoder->nZerosAppended += nZeros; |