commit 7c9f1165e7f891c846c550d925ffec7d421175e8
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 28 15:12:32 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 28 15:12:32 2018 -0800
tree e4fbed799d9f3c82992df2f94894562d2ed7370f
parent e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df
parent 385764944de311fc2985ea5b04c4c3e1826ecd82

Merge "Skip CRC check when flushing or concealment is applied"
am: 385764944d

Change-Id: Ia9cd7ecef842760c4a249fce51522bc9afef4d47

libAACdec/src/aacdecoder.cpp

diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index a529389..fffc1f0 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -3033,9 +3033,11 @@
     aacChannels = 0;
   }
 
-  if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) {
-    ErrorStatus = AAC_DEC_CRC_ERROR;
-    self->frameOK = 0;
+  if (!(flags & (AACDEC_CONCEAL | AACDEC_FLUSH))) {
+    if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) {
+      ErrorStatus = AAC_DEC_CRC_ERROR;
+      self->frameOK = 0;
+    }
   }
 
   /* Ensure that in case of concealment a proper error status is set. */