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

am: 385764944d

Change-Id: Ia9cd7ecef842760c4a249fce51522bc9afef4d47
This commit is contained in:
Jean-Michel Trivi 2018-12-28 15:12:32 -08:00 committed by android-build-merger
commit 7c9f1165e7
1 changed files with 5 additions and 3 deletions

View File

@ -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. */