| commit | 01de790c4f4d837471f7cb76558a5726382ba5a0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 22:50:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 22:50:52 2020 +0000 |
| tree | a0d6fcd0ebb5f16a193392d3d40073e2fc40dbdd | |
| parent | cb4b6a0fee5e7cf5a9da201888de864bfadad109 [diff] | |
| parent | fb1290cb15bc34cf8a628b118b5d93e0ee2d078b [diff] |
Merge "aacdec: fix error handling" into rvc-dev am: 50b8acd4e1 am: fb1290cb15 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12002255 Change-Id: I8da79b8894e46c08b6e6cdff1324b348caf95338
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);