1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-07 13:22:24 +01:00

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

am: 7c9f1165e7

Change-Id: Ia818ae31a012d18cefad45ea969123d09ff6e31a
This commit is contained in:
Jean-Michel Trivi 2018-12-28 15:19:17 -08:00 committed by android-build-merger
commit 7b664f0bea

View File

@ -3033,9 +3033,11 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
aacChannels = 0; aacChannels = 0;
} }
if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) { if (!(flags & (AACDEC_CONCEAL | AACDEC_FLUSH))) {
ErrorStatus = AAC_DEC_CRC_ERROR; if (TRANSPORTDEC_OK != transportDec_CrcCheck(self->hInput)) {
self->frameOK = 0; ErrorStatus = AAC_DEC_CRC_ERROR;
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. */