commit 84889cbfd31daadca6fd0ef8048bf99104373e30
author Wonsik Kim <wonsik@google.com> Thu Jan 03 17:07:54 2019 -0800
committer Wonsik Kim <wonsik@google.com> Thu Jan 03 17:08:44 2019 -0800
tree f542c8f4605ae5e63eaa7ce214b67f9fffbcdfda
parent ebaf2f5885ee21375545f6b4b98d9e99d226ec39

aacenc: fix timestamp calculation

Test: log audio timestamps
Change-Id: Ic09173b871a25366930e38b36e7c398c0dba24cc

media/codec2/components/aac/C2SoftAacEnc.cpp

diff --git a/media/codec2/components/aac/C2SoftAacEnc.cpp b/media/codec2/components/aac/C2SoftAacEnc.cpp
index aeefbdb..87730ae 100644
--- a/media/codec2/components/aac/C2SoftAacEnc.cpp
+++ b/media/codec2/components/aac/C2SoftAacEnc.cpp
@@ -468,7 +468,8 @@
 
             if (outargs.numOutBytes > 0) {
                 mInputSize = 0;
-                int consumed = ((capacity / sizeof(int16_t)) - inargs.numInSamples);
+                int consumed = (capacity / sizeof(int16_t)) - inargs.numInSamples
+                        + outargs.numInSamples;
                 mInputTimeUs = work->input.ordinal.timestamp
                         + (consumed * 1000000ll / channelCount / sampleRate);
                 buffer = createLinearBuffer(block, 0, outargs.numOutBytes);