commit 3145a63de72966b73f41bcb891ef0197517e96ea
author Wonsik Kim <wonsik@google.com> Mon Apr 22 18:13:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 22 18:13:52 2019 -0700
tree 9f0085b2d4a5e77de7797a24cfeb2b7516ffac69
parent e719168854d03ba9561c438205c7c6ba186926df
parent 669dda14bd4ae41277a916a7c2e5889fe4dbb17c

Merge "C2SoftVorbisDec: Ignore subsequent headers" into qt-dev
am: 669dda14bd

Change-Id: I11f165d74080755f8d87c6cc2f7d1f614c6de084

media/codec2/components/vorbis/C2SoftVorbisDec.cpp

diff --git a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
index e7393ee..e3bafd3 100644
--- a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
+++ b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
@@ -270,7 +270,8 @@
     const uint8_t *data = rView.data() + inOffset;
     int32_t numChannels  = mVi->channels;
     int32_t samplingRate = mVi->rate;
-    if (inSize > 7 && !memcmp(&data[1], "vorbis", 6)) {
+    /* Decode vorbis headers only once */
+    if (inSize > 7 && !memcmp(&data[1], "vorbis", 6) && (!mInfoUnpacked || !mBooksUnpacked)) {
         if ((data[0] != 1) && (data[0] != 5)) {
             ALOGE("unexpected type received %d", data[0]);
             mSignalledError = true;