diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 23:04:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-28 23:04:26 +0000 |
| commit | 385764944de311fc2985ea5b04c4c3e1826ecd82 (patch) | |
| tree | e4fbed799d9f3c82992df2f94894562d2ed7370f | |
| parent | 83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d (diff) | |
| parent | 0ca9742ad246a1a0fe9835074c2f65e3de7b69dc (diff) | |
| download | fdk-aac-385764944de311fc2985ea5b04c4c3e1826ecd82.tar.gz fdk-aac-385764944de311fc2985ea5b04c4c3e1826ecd82.tar.bz2 fdk-aac-385764944de311fc2985ea5b04c4c3e1826ecd82.zip | |
Merge "Skip CRC check when flushing or concealment is applied"
| -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. */ |