diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 15:12:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-28 15:12:32 -0800 |
| commit | 7c9f1165e7f891c846c550d925ffec7d421175e8 (patch) | |
| tree | e4fbed799d9f3c82992df2f94894562d2ed7370f | |
| parent | e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df (diff) | |
| parent | 385764944de311fc2985ea5b04c4c3e1826ecd82 (diff) | |
| download | fdk-aac-7c9f1165e7f891c846c550d925ffec7d421175e8.tar.gz fdk-aac-7c9f1165e7f891c846c550d925ffec7d421175e8.tar.bz2 fdk-aac-7c9f1165e7f891c846c550d925ffec7d421175e8.zip | |
Merge "Skip CRC check when flushing or concealment is applied"
am: 385764944d
Change-Id: Ia9cd7ecef842760c4a249fce51522bc9afef4d47
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( 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. */ |