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

Commit 3145a63d authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

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

am: 669dda14

Change-Id: I11f165d74080755f8d87c6cc2f7d1f614c6de084
parents e7191688 669dda14
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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;