| commit | 9ecde4d5cf1a66021dc9963d2d592b3a0abcc96e | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Thu May 06 23:58:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 06 23:58:45 2021 +0000 |
| tree | b2dbcd1835515b19268671683598c5ddb9104725 | |
| parent | 789d1db552d0bfa2186df2177881fc954e72c7be [diff] | |
| parent | 64ece9cc0a7628f84135b209e6fb29d35db12464 [diff] |
Merge "C2SoftFlacDec: add support to receive multiple CSDs" am: 972aa71d37 am: 1c58368eb6 am: 64ece9cc0a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1677106 Change-Id: I9349a6278267bfc98b9fc284f48b8baa73106992
diff --git a/media/codec2/components/flac/C2SoftFlacDec.cpp b/media/codec2/components/flac/C2SoftFlacDec.cpp index e70c289..49892a4 100644 --- a/media/codec2/components/flac/C2SoftFlacDec.cpp +++ b/media/codec2/components/flac/C2SoftFlacDec.cpp
@@ -221,6 +221,11 @@ uint8_t *input = const_cast<uint8_t *>(rView.data() + inOffset); if (codecConfig) { + if (mHasStreamInfo) { + ALOGV("Ignore Codec Config"); + fillEmptyWork(work); + return; + } status_t decoderErr = mFLACDecoder->parseMetadata(input, inSize); if (decoderErr != OK && decoderErr != WOULD_BLOCK) { ALOGE("process: FLACDecoder parseMetaData returns error %d", decoderErr);