diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 15:19:17 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-28 15:19:17 -0800 |
| commit | 7b664f0bea348bcc86329e58b8a4f05f767608e1 (patch) | |
| tree | e8bf1d2fe53de97ce00b48d97d55475039e80da5 /libAACdec/src | |
| parent | ccbdcbecd059995b7bb24ffac612fdc10c921d80 (diff) | |
| parent | 7c9f1165e7f891c846c550d925ffec7d421175e8 (diff) | |
| download | fdk-aac-7b664f0bea348bcc86329e58b8a4f05f767608e1.tar.gz fdk-aac-7b664f0bea348bcc86329e58b8a4f05f767608e1.tar.bz2 fdk-aac-7b664f0bea348bcc86329e58b8a4f05f767608e1.zip | |
Merge "Skip CRC check when flushing or concealment is applied" am: 385764944d
am: 7c9f1165e7
Change-Id: Ia818ae31a012d18cefad45ea969123d09ff6e31a
Diffstat (limited to 'libAACdec/src')
| -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. */ |