| commit | 1c58368eb6fade09816bbb9baf49f92299c70cae | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Thu May 06 23:37:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 06 23:37:40 2021 +0000 |
| tree | c005822ad3c96e28618164fd41d5df0acce22ffa | |
| parent | 79c1cf9bdf8d711909ecf08a8b227d65bcdce248 [diff] | |
| parent | 972aa71d378bc61bb3f8df2425890966d5bf0c39 [diff] |
Merge "C2SoftFlacDec: add support to receive multiple CSDs" am: 972aa71d37 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1677106 Change-Id: Ib16284fff25ce752fa9ba420bd6e6f08ab445961
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);