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

Commit fe324a61 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I8d87cd98 into eclair-mr2 

* changes:
  Fix various compiler warnings accumulated over time.
parents ceabc645 8d87cd98

include/media/stagefright/SampleTable.h

+5 −5
Original line number Diff line number Diff line
@@ -35,17 +35,17 @@ public: 


    // type can be 'stco' or 'co64'.

    status_t setChunkOffsetParams(

            uint32_t type, off_t data_offset, off_t data_size);

            uint32_t type, off_t data_offset, size_t data_size);



    status_t setSampleToChunkParams(off_t data_offset, off_t data_size);

    status_t setSampleToChunkParams(off_t data_offset, size_t data_size);



    // type can be 'stsz' or 'stz2'.

    status_t setSampleSizeParams(

            uint32_t type, off_t data_offset, off_t data_size);

            uint32_t type, off_t data_offset, size_t data_size);



    status_t setTimeToSampleParams(off_t data_offset, off_t data_size);

    status_t setTimeToSampleParams(off_t data_offset, size_t data_size);



    status_t setSyncSampleParams(off_t data_offset, off_t data_size);

    status_t setSyncSampleParams(off_t data_offset, size_t data_size);



    ////////////////////////////////////////////////////////////////////////////

media/libstagefright/HTTPDataSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ HTTPDataSource::~HTTPDataSource() { 
}



ssize_t HTTPDataSource::read_at(off_t offset, void *data, size_t size) {

    if (offset >= mBufferOffset && offset < mBufferOffset + mBufferLength) {

    if (offset >= mBufferOffset

            && offset < (off_t)(mBufferOffset + mBufferLength)) {

        size_t num_bytes_available = mBufferLength - (offset - mBufferOffset);



        size_t copy = num_bytes_available;

media/libstagefright/MediaBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ size_t MediaBuffer::range_length() const { 
}



void MediaBuffer::set_range(size_t offset, size_t length) {

    if (offset < 0 || offset + length > mSize) {

    if (offset + length > mSize) {

        LOGE("offset = %d, length = %d, mSize = %d", offset, length, mSize);

    }

    CHECK(offset >= 0 && offset + length <= mSize);

    CHECK(offset + length <= mSize);



    mRangeOffset = offset;

    mRangeLength = length;

media/libstagefright/MediaPlayerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ void MediaPlayerImpl::populateISurface() { 
    success = success && meta->findInt32(kKeyHeight, &decodedHeight);

    CHECK(success);



    LOGI("mVideoWidth=%ld, mVideoHeight=%ld, decodedWidth=%ld, decodedHeight=%ld",

    LOGI("mVideoWidth=%d, mVideoHeight=%d, decodedWidth=%d, decodedHeight=%d",

         mVideoWidth, mVideoHeight, decodedWidth, decodedHeight);



    if (mSurface.get() != NULL) {

media/libstagefright/SampleTable.cpp

+5 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ SampleTable::~SampleTable() { 
}



status_t SampleTable::setChunkOffsetParams(

        uint32_t type, off_t data_offset, off_t data_size) {

        uint32_t type, off_t data_offset, size_t data_size) {

    if (mChunkOffsetOffset >= 0) {

        return ERROR_MALFORMED;

    }
@@ -95,7 +95,7 @@ status_t SampleTable::setChunkOffsetParams( 
}



status_t SampleTable::setSampleToChunkParams(

        off_t data_offset, off_t data_size) {

        off_t data_offset, size_t data_size) {

    if (mSampleToChunkOffset >= 0) {

        return ERROR_MALFORMED;

    }
@@ -127,7 +127,7 @@ status_t SampleTable::setSampleToChunkParams( 
}



status_t SampleTable::setSampleSizeParams(

        uint32_t type, off_t data_offset, off_t data_size) {

        uint32_t type, off_t data_offset, size_t data_size) {

    if (mSampleSizeOffset >= 0) {

        return ERROR_MALFORMED;

    }
@@ -187,7 +187,7 @@ status_t SampleTable::setSampleSizeParams( 
}



status_t SampleTable::setTimeToSampleParams(

        off_t data_offset, off_t data_size) {

        off_t data_offset, size_t data_size) {

    if (mTimeToSample != NULL || data_size < 8) {

        return ERROR_MALFORMED;

    }
@@ -219,7 +219,7 @@ status_t SampleTable::setTimeToSampleParams( 
    return OK;

}



status_t SampleTable::setSyncSampleParams(off_t data_offset, off_t data_size) {

status_t SampleTable::setSyncSampleParams(off_t data_offset, size_t data_size) {

    if (mSyncSampleOffset >= 0 || data_size < 8) {

        return ERROR_MALFORMED;

    }