| commit | 1f5583ef37f1b43d470ff9a1ef8b8dc4e0305ca7 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Aug 09 10:35:55 2019 -0700 |
| committer | Wonsik Kim <wonsik@google.com> | Tue Oct 22 20:33:22 2019 +0000 |
| tree | eb89bf0c356c27b19b6260a147a8eaace0153ed8 | |
| parent | ca7582109dd529eb80dff3d6135a20950a9e3b47 [diff] [blame] |
aacenc: handle input size not aligned at sample boundary Bug: 136068046 Bug: 142699551 Test: modified EncoderTest Change-Id: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2 Merged-In: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2 (cherry picked from commit 3dd7bd3440ef048fa0fcd9d86c42ac75038e9c11)
diff --git a/media/codec2/components/aac/C2SoftAacEnc.h b/media/codec2/components/aac/C2SoftAacEnc.h index 2655039..6ecfbdd 100644 --- a/media/codec2/components/aac/C2SoftAacEnc.h +++ b/media/codec2/components/aac/C2SoftAacEnc.h
@@ -61,6 +61,10 @@ bool mSignalledError; std::atomic_uint64_t mOutIndex; + // We support max 6 channels + uint8_t mRemainder[6 * sizeof(int16_t)]; + size_t mRemainderLen; + status_t initEncoder(); status_t setAudioParams();