| commit | 8e86930467063e2a95f135ea4eccbb098c29d111 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 23:04:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 23:04:45 2020 +0000 |
| tree | d29ca9be16a38b60a95b3d524c50538f71b975a2 | |
| parent | 7fa6e30d7eb0cb74393b378ed808a1c2be60648c [diff] | |
| parent | 290a16b146ed9f1bdf5ea65afbe19cfd11302de5 [diff] |
Merge "aacdec: fix error handling" into rvc-dev am: 50b8acd4e1 am: fb1290cb15 am: 290a16b146 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12002255 Change-Id: Icbba40c06eead1b2a35347fc836a3a2b4716b4f0
diff --git a/media/codec2/components/aac/C2SoftAacDec.cpp b/media/codec2/components/aac/C2SoftAacDec.cpp index 9884733..677f316 100644 --- a/media/codec2/components/aac/C2SoftAacDec.cpp +++ b/media/codec2/components/aac/C2SoftAacDec.cpp
@@ -791,7 +791,6 @@ // After an error, replace bufferSize with the sum of the // decodedSizes to resynchronize the in/out lists. - inInfo.decodedSizes.pop_back(); inInfo.bufferSize = std::accumulate( inInfo.decodedSizes.begin(), inInfo.decodedSizes.end(), 0);