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

Commit 25710af9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545,... 

Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545, 13083736, 13083575, 13083776, 13083778, 13083757, 13083547, 13083530, 13083719, 13083780, 13083739, 13083549, 13083741, 13083742, 13083590, 13083593, 13083594, 13083816, 13083818, 13083820, 13083822, 13083824, 13083827, 13083828, 13083552, 13083760, 13083762, 13083764, 13083782, 13083784, 13083831, 13083787, 13083766, 13083835, 13083745, 13083877, 13083720, 13083489, 13083491, 13083274, 13083859, 13083897] into rvc-qpr1-release

Change-Id: I1dddebe4791ece09e6be7251edf4da466f347e47
parents 3bac8972 bb460899

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
@@ -1433,7 +1433,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);