commit 23316b36ad0d86a253fbec7b4e2bc02ef9e88cca
author android-build-team Robot <android-build-team-robot@google.com> Tue Oct 29 15:42:04 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 29 15:42:50 2019 +0000
tree 655c370a50ce444dce9b6e85dd2947fc22e1a66e
parent 71dc1842ef7f24b3dc59e16ce76218165f56c42b
parent cca4b68d9ae6727e438e74299517ff7b8c5ea488

Make change and version bump to q_pr1-release_aml_291900600 for mainline module file: apex/manifest_codec.json

Change-Id: Icb4f8f6654e6c2a227b86896c4e34ba1ff53abe3

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index b25ebd4..c3f845b 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 291900500
+  "version": 291900600
 }

apex/manifest_codec.json

diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index 7173066..d52f94b 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 291900500
+  "version": 291900600
 }

media/codec2/components/aac/C2SoftAacEnc.cpp

diff --git a/media/codec2/components/aac/C2SoftAacEnc.cpp b/media/codec2/components/aac/C2SoftAacEnc.cpp
index a8f39d5..be52a1d 100644
--- a/media/codec2/components/aac/C2SoftAacEnc.cpp
+++ b/media/codec2/components/aac/C2SoftAacEnc.cpp
@@ -521,16 +521,14 @@
                 mInputSize += outargs.numInSamples * sizeof(int16_t);
             }
 
-            if (outargs.numInSamples > 0) {
-                inBuffer[0] = (int16_t *)inBuffer[0] + outargs.numInSamples;
-                inBufferSize[0] -= outargs.numInSamples * sizeof(int16_t);
-                inargs.numInSamples -= outargs.numInSamples;
-            }
-
             if (inBuffer[0] == mRemainder) {
                 inBuffer[0] = const_cast<uint8_t *>(data);
                 inBufferSize[0] = capacity;
                 inargs.numInSamples = capacity / sizeof(int16_t);
+            } else if (outargs.numInSamples > 0) {
+                inBuffer[0] = (int16_t *)inBuffer[0] + outargs.numInSamples;
+                inBufferSize[0] -= outargs.numInSamples * sizeof(int16_t);
+                inargs.numInSamples -= outargs.numInSamples;
             }
         }
         ALOGV("encoderErr = %d mInputSize = %zu "