diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 15:24:40 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-28 15:24:40 -0800 |
| commit | d00da81a1d0e6bf1e66396b782e73a234464eb7a (patch) | |
| tree | a90116c01ff21ab639e90c2c7d9a31f80750245b /libAACdec/src | |
| parent | 56b20d2c760a2fde22eaf838b33e9bc00be4ddfb (diff) | |
| parent | 7b664f0bea348bcc86329e58b8a4f05f767608e1 (diff) | |
| download | fdk-aac-d00da81a1d0e6bf1e66396b782e73a234464eb7a.tar.gz fdk-aac-d00da81a1d0e6bf1e66396b782e73a234464eb7a.tar.bz2 fdk-aac-d00da81a1d0e6bf1e66396b782e73a234464eb7a.zip | |
Merge "Skip CRC check when flushing or concealment is applied" am: 385764944d am: 7c9f1165e7
am: 7b664f0bea
Change-Id: I205000a7dd682df83dff15afbd35772ed7c14a0f
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. */ |