commit c426a76e1cc3521cdf76926db5f1256fb99fa375
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 30 00:24:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 30 00:24:37 2021 +0000
tree 59eb5a36c24491759f4056af3c8b3e226ea092f4
parent 17d235e547f66ee0a852020b9f0ea477e7bbc101
parent 0e90623454b216ecdb854b8b8fc1ecf26ab55832

Merge "C2SoftAacDec: Fix reset while codec's stop()"

media/codec2/components/aac/C2SoftAacDec.cpp

diff --git a/media/codec2/components/aac/C2SoftAacDec.cpp b/media/codec2/components/aac/C2SoftAacDec.cpp
index f948dd4..342d771 100644
--- a/media/codec2/components/aac/C2SoftAacDec.cpp
+++ b/media/codec2/components/aac/C2SoftAacDec.cpp
@@ -289,13 +289,14 @@
     mOutputDelayRingBufferFilled = 0;
     mBuffersInfo.clear();
 
-    // To make the codec behave the same before and after a reset, we need to invalidate the
-    // streaminfo struct. This does that:
-    mStreamInfo->sampleRate = 0; // TODO: mStreamInfo is read only
-
+    status_t status = UNKNOWN_ERROR;
+    if (mAACDecoder) {
+        aacDecoder_Close(mAACDecoder);
+        status = initDecoder();
+    }
     mSignalledError = false;
 
-    return C2_OK;
+    return status == OK ? C2_OK : C2_CORRUPTED;
 }
 
 void C2SoftAacDec::onReset() {