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

Commit 89ee55cb authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "OggExtractor: ignore timestamp calculation for configuration packets" into lmp-mr1-dev

parents 1391f933 9fc1bf13

media/libstagefright/OggExtractor.cpp

+8 −10
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ struct MyVorbisExtractor { 




    status_t seekToTime(int64_t timeUs);

    status_t seekToTime(int64_t timeUs);

    status_t seekToOffset(off64_t offset);

    status_t seekToOffset(off64_t offset);

    status_t readNextPacket(MediaBuffer **buffer);

    status_t readNextPacket(MediaBuffer **buffer, bool conf);





    status_t init();

    status_t init();
@@ -185,7 +185,7 @@ status_t OggSource::read( 
    }

    }





    MediaBuffer *packet;

    MediaBuffer *packet;

    status_t err = mExtractor->mImpl->readNextPacket(&packet);

    status_t err = mExtractor->mImpl->readNextPacket(&packet, /* conf = */ false);





    if (err != OK) {

    if (err != OK) {

        return err;

        return err;
@@ -457,7 +457,7 @@ ssize_t MyVorbisExtractor::readPage(off64_t offset, Page *page) { 
    return sizeof(header) + page->mNumSegments + totalSize;

    return sizeof(header) + page->mNumSegments + totalSize;

}

}





status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) {

status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out, bool conf) {

    *out = NULL;

    *out = NULL;





    MediaBuffer *buffer = NULL;

    MediaBuffer *buffer = NULL;
@@ -523,10 +523,8 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) { 
                    mFirstPacketInPage = false;

                    mFirstPacketInPage = false;

                }

                }





                if (mVi.rate) {

                // ignore timestamp for configuration packets

                    // Rate may not have been initialized yet if we're currently

                if (!conf) {

                    // reading the configuration packets...

                    // Fortunately, the timestamp doesn't matter for those.

                    int32_t curBlockSize = packetBlockSize(buffer);

                    int32_t curBlockSize = packetBlockSize(buffer);

                    if (mCurrentPage.mPrevPacketSize < 0) {

                    if (mCurrentPage.mPrevPacketSize < 0) {

                        mCurrentPage.mPrevPacketSize = curBlockSize;

                        mCurrentPage.mPrevPacketSize = curBlockSize;
@@ -605,7 +603,7 @@ status_t MyVorbisExtractor::init() { 




    MediaBuffer *packet;

    MediaBuffer *packet;

    status_t err;

    status_t err;

    if ((err = readNextPacket(&packet)) != OK) {

    if ((err = readNextPacket(&packet, /* conf = */ true)) != OK) {

        return err;

        return err;

    }

    }

    ALOGV("read packet of size %zu\n", packet->range_length());

    ALOGV("read packet of size %zu\n", packet->range_length());
@@ -616,7 +614,7 @@ status_t MyVorbisExtractor::init() { 
        return err;

        return err;

    }

    }





    if ((err = readNextPacket(&packet)) != OK) {

    if ((err = readNextPacket(&packet, /* conf = */ true)) != OK) {

        return err;

        return err;

    }

    }

    ALOGV("read packet of size %zu\n", packet->range_length());

    ALOGV("read packet of size %zu\n", packet->range_length());
@@ -627,7 +625,7 @@ status_t MyVorbisExtractor::init() { 
        return err;

        return err;

    }

    }





    if ((err = readNextPacket(&packet)) != OK) {

    if ((err = readNextPacket(&packet, /* conf = */ true)) != OK) {

        return err;

        return err;

    }

    }

    ALOGV("read packet of size %zu\n", packet->range_length());

    ALOGV("read packet of size %zu\n", packet->range_length());