commit ec42fa2d8f8d05e308300608a9c511b596a11a1c
author Manisha Jajoo <manisha.jajoo@ittiam.com> Mon Apr 12 18:53:36 2021 +0530
committer Manisha Jajoo <manisha.jajoo@ittiam.com> Thu Apr 15 20:19:44 2021 +0530
tree 322f9d3cd6ccd109ecd8450aef80d40cc003486c
parent 7d50550bc316ebe96935362b8c18158e3e9cdabf

C2SoftFlacDec: add support to receive multiple CSDs

Bug: 184595426
Test: atest --iterations 10 android.mediav2.cts.CodecDecoderTest

Change-Id: I305d661656b3044aa840a5c9d550cb05a7b52b0f

media/codec2/components/flac/C2SoftFlacDec.cpp

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