Merge "Fix overflow in PCR calculations" into nyc-dev

            // The number of bytes received by this parser up to and

            // including the final byte of this PCR_ext field.

            size_t byteOffsetFromStart =

                mNumTSPacketsParsed * 188 + byteOffsetFromStartOfTSPacket;

            uint64_t byteOffsetFromStart =

                uint64_t(mNumTSPacketsParsed) * 188 + byteOffsetFromStartOfTSPacket;

            for (size_t i = 0; i < mPrograms.size(); ++i) {

                updatePCR(PID, PCR, byteOffsetFromStart);

__attribute__((no_sanitize("integer")))

void ATSParser::updatePCR(

        unsigned /* PID */, uint64_t PCR, size_t byteOffsetFromStart) {

    ALOGV("PCR 0x%016" PRIx64 " @ %zu", PCR, byteOffsetFromStart);

        unsigned /* PID */, uint64_t PCR, uint64_t byteOffsetFromStart) {

    ALOGV("PCR 0x%016" PRIx64 " @ %" PRIx64, PCR, byteOffsetFromStart);

    if (mNumPCRs == 2) {

        mPCR[0] = mPCR[1];

    // see feedTSPacket().

    status_t parseTS(ABitReader *br, SyncEvent *event);

    void updatePCR(unsigned PID, uint64_t PCR, size_t byteOffsetFromStart);

    void updatePCR(unsigned PID, uint64_t PCR, uint64_t byteOffsetFromStart);

    uint64_t mPCR[2];

    size_t mPCRBytes[2];

    uint64_t mPCRBytes[2];

    int64_t mSystemTimeUs[2];

    size_t mNumPCRs;