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

Commit ea543db8 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fail more gracefully on version mismatch"

parents 2eeca1f8 04022b34
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1924,13 +1924,13 @@ status_t MPEG4Extractor::parseTrackHeader(
        mtime = U64_AT(&buffer[12]);
        id = U32_AT(&buffer[20]);
        duration = U64_AT(&buffer[28]);
    } else {
        CHECK_EQ((unsigned)version, 0u);

    } else if (version == 0) {
        ctime = U32_AT(&buffer[4]);
        mtime = U32_AT(&buffer[8]);
        id = U32_AT(&buffer[12]);
        duration = U32_AT(&buffer[20]);
    } else {
        return ERROR_UNSUPPORTED;
    }

    mLastTrack->meta->setInt32(kKeyTrackID, id);