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

Commit d1e4909d authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE 

Merged-In: Iba76866c0e33a9fb69ba6798ebc8ffc9677a5dc7
Change-Id: I868508f0deac92b4432d46be1629b97ac86b8e28
parents b572b63b 25710af9

media/extractors/wav/WAVExtractor.cpp

+7 −7
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ private: 
    AMediaFormat *mMeta;

    uint16_t mWaveFormat;

    const bool mOutputFloat;

    int32_t mSampleRate;

    int32_t mNumChannels;

    int32_t mBitsPerSample;

    uint32_t mSampleRate;

    uint32_t mNumChannels;

    uint32_t mBitsPerSample;

    off64_t mOffset;

    size_t mSize;

    bool mStarted;
@@ -379,9 +379,9 @@ WAVSource::WAVSource( 
      mOffset(offset),

      mSize(size),

      mStarted(false) {

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE, &mSampleRate));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_CHANNEL_COUNT, &mNumChannels));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, &mBitsPerSample));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE, (int32_t*) &mSampleRate));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_CHANNEL_COUNT, (int32_t*) &mNumChannels));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, (int32_t*) &mBitsPerSample));

}



WAVSource::~WAVSource() {
@@ -472,7 +472,7 @@ media_status_t WAVSource::read( 
    }



    const size_t maxBytesAvailable =

        (mCurrentPos - mOffset >= (off64_t)mSize)

        (mCurrentPos < mOffset || mCurrentPos - mOffset >= (off64_t)mSize)

            ? 0 : mSize - (mCurrentPos - mOffset);



    if (maxBytesToRead > maxBytesAvailable) {

media/libstagefright/mpeg2ts/ESQueue.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,13 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitH264() { 
                if (mSampleDecryptor != NULL && (nalType == 1 || nalType == 5)) {

                    uint8_t *nalData = mBuffer->data() + pos.nalOffset;

                    size_t newSize = mSampleDecryptor->processNal(nalData, pos.nalSize);

                    // Note: the data can shrink due to unescaping

                    // Note: the data can shrink due to unescaping, but it can never grow

                    if (newSize > pos.nalSize) {

                        // don't log unless verbose, since this can get called a lot if

                        // the caller is trying to resynchronize

                        ALOGV("expected sample size < %u, got %zu", pos.nalSize, newSize);

                        return NULL;

                    }

                    memcpy(accessUnit->data() + dstOffset + 4,

                            nalData,

                            newSize);