diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-03-08 16:08:40 +0100 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2019-05-14 09:09:19 -0700 |
| commit | 89ca476e525187ca01bca3cfd87785d860e7bde8 (patch) | |
| tree | 51940bd211765d56c26670b6a1ef0078202db474 | |
| parent | e970ac4c95e2e1016c72caa5218fc8f1bafe58fe (diff) | |
| download | fdk-aac-89ca476e525187ca01bca3cfd87785d860e7bde8.tar.gz fdk-aac-89ca476e525187ca01bca3cfd87785d860e7bde8.tar.bz2 fdk-aac-89ca476e525187ca01bca3cfd87785d860e7bde8.zip | |
Fetch multiple samples of input channels from encoder input buffer.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I548c62efcbe2629479f671befd4388895d835de7
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 08cd57a..0f0094f 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1761,6 +1761,10 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, hAacEncoder->inputBuffer + (hAacEncoder->inputBufferOffset + hAacEncoder->nSamplesRead) / hAacEncoder->aacConfig.nChannels; + newSamples -= + (newSamples % + hAacEncoder->extParam + .nChannels); /* process multiple samples of input channels */ /* Copy new input samples to internal buffer */ if (inBufDesc->bufElSizes[idx] == (INT)sizeof(INT_PCM)) { |