commit 56bb7ed6f8f315ed6cfd0e42fa2d9a156e9ed4eb
author Wonsik Kim <wonsik@google.com> Thu Jun 25 10:59:54 2020 -0700
committer Wonsik Kim <wonsik@google.com> Thu Jun 25 11:07:32 2020 -0700
tree 69ec15fe0522c3f57c18b26c351358a56ff58f71
parent de38ff80042687152302c73df823fccad2b8c25e

aacdec: fix error handling

Mark frames substituted with silence due to an error as consumed.

Bug: 158471477
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I9c3c3c2d591108be6e40112fd20bd157beb9378b

media/codec2/components/aac/C2SoftAacDec.cpp

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);