Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64ece9cc authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "C2SoftFlacDec: add support to receive multiple CSDs" am: 972aa71d am: 1c58368e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1677106

Change-Id: I83b64071c6693bc4a96c7d6d0d87919265fe8438
parents cc6a9386 1c58368e

media/codec2/components/flac/C2SoftFlacDec.cpp

+5 −0
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ void C2SoftFlacDec::process( 


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