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

Commit f242406e authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am:... 

SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc am: a1e309be am: 63e9b573 am: ef217380 am: 59f9cc2a am: 9be65cb0 am: 9b449c48 am: 7a33c062 am: f0eb48c8 am: 64cb47ee am: 54355d98
am: 17cb0490

* commit '17cb0490':
  SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I77f2cb755f6e33106d0c331bfd7acb0437737a47
parents 93b686a2 17cb0490

media/libstagefright/SampleTable.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -121,6 +121,7 @@ SampleTable::SampleTable(const sp<DataSource> &source) 
      mSampleSizeFieldSize(0),

      mSampleSizeFieldSize(0),

      mDefaultSampleSize(0),

      mDefaultSampleSize(0),

      mNumSampleSizes(0),

      mNumSampleSizes(0),

      mHasTimeToSample(false),

      mTimeToSampleCount(0),

      mTimeToSampleCount(0),

      mTimeToSample(),

      mTimeToSample(),

      mSampleTimeEntries(NULL),

      mSampleTimeEntries(NULL),
@@ -159,7 +160,7 @@ bool SampleTable::isValid() const { 
    return mChunkOffsetOffset >= 0

    return mChunkOffsetOffset >= 0

        && mSampleToChunkOffset >= 0

        && mSampleToChunkOffset >= 0

        && mSampleSizeOffset >= 0

        && mSampleSizeOffset >= 0

        && !mTimeToSample.empty();

        && mHasTimeToSample;

}

}





status_t SampleTable::setChunkOffsetParams(

status_t SampleTable::setChunkOffsetParams(
@@ -333,7 +334,7 @@ status_t SampleTable::setSampleSizeParams( 




status_t SampleTable::setTimeToSampleParams(

status_t SampleTable::setTimeToSampleParams(

        off64_t data_offset, size_t data_size) {

        off64_t data_offset, size_t data_size) {

    if (!mTimeToSample.empty() || data_size < 8) {

    if (mHasTimeToSample || data_size < 8) {

        return ERROR_MALFORMED;

        return ERROR_MALFORMED;

    }

    }
@@ -372,6 +373,8 @@ status_t SampleTable::setTimeToSampleParams( 
    for (size_t i = 0; i < mTimeToSample.size(); ++i) {

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

        mTimeToSample.editItemAt(i) = ntohl(mTimeToSample[i]);

        mTimeToSample.editItemAt(i) = ntohl(mTimeToSample[i]);

    }

    }



    mHasTimeToSample = true;

    return OK;

    return OK;

}

}

media/libstagefright/include/SampleTable.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ private: 
    uint32_t mDefaultSampleSize;

    uint32_t mDefaultSampleSize;

    uint32_t mNumSampleSizes;

    uint32_t mNumSampleSizes;





    bool mHasTimeToSample;

    uint32_t mTimeToSampleCount;

    uint32_t mTimeToSampleCount;

    Vector<uint32_t> mTimeToSample;

    Vector<uint32_t> mTimeToSample;