Merge "Skip CRC check when flushing or concealment is applied"

This commit is contained in:
Jean-Michel Trivi 2018-12-28 23:04:26 +00:00 committed by Gerrit Code Review
commit 385764944d
1 changed files with 5 additions and 3 deletions

View File

@ -3033,10 +3033,12 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
aacChannels = 0; aacChannels = 0;
} }
if (!(flags & (AACDEC_CONCEAL | AACDEC_FLUSH))) {
if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) { if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) {
ErrorStatus = AAC_DEC_CRC_ERROR; ErrorStatus = AAC_DEC_CRC_ERROR;
self->frameOK = 0; self->frameOK = 0;
} }
}
/* Ensure that in case of concealment a proper error status is set. */ /* Ensure that in case of concealment a proper error status is set. */
if ((self->frameOK == 0) && (ErrorStatus == AAC_DEC_OK)) { if ((self->frameOK == 0) && (ErrorStatus == AAC_DEC_OK)) {