Merge "C2SoftVorbisDec: Ignore subsequent headers" into qt-dev

5 years ago · 669dda14bd
parent c6de9ed177 7d8c37634f
commit 669dda14bd
1 changed files with 2 additions and 1 deletions
--- a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
+++ b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
@ -270,7 +270,8 @@ void C2SoftVorbisDec::process(
    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;