1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00

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

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)) {