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

Commit 3d2c309b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused methods in Media(Source|Buffer)"

parents bfe745ef 2efe43d3

media/libmediaextractor/MediaSource.cpp

+0 −9
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ MediaSource::ReadOptions::ReadOptions() { 
void MediaSource::ReadOptions::reset() {

    mOptions = 0;

    mSeekTimeUs = 0;

    mLatenessUs = 0;

    mNonBlocking = false;

}
@@ -67,12 +66,4 @@ bool MediaSource::ReadOptions::getSeekTo( 
    return (mOptions & kSeekTo_Option) != 0;

}



void MediaSource::ReadOptions::setLateBy(int64_t lateness_us) {

    mLatenessUs = lateness_us;

}



int64_t MediaSource::ReadOptions::getLateBy() const {

    return mLatenessUs;

}



}  // namespace android

media/libmediaextractor/include/media/MediaSource.h

+0 −5
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ struct MediaSource : public virtual RefBase { 
        void clearSeekTo();

        bool getSeekTo(int64_t *time_us, SeekMode *mode) const;



        // TODO: remove this if unused.

        void setLateBy(int64_t lateness_us);

        int64_t getLateBy() const;



        void setNonBlocking();

        void clearNonBlocking();

        bool getNonBlocking() const;
@@ -93,7 +89,6 @@ struct MediaSource : public virtual RefBase { 
        uint32_t mOptions;

        int64_t mSeekTimeUs;

        SeekMode mSeekMode;

        int64_t mLatenessUs;

        bool mNonBlocking;

    } __attribute__((packed)); // sent through Binder

media/libstagefright/foundation/MediaBuffer.cpp

+2 −23
Original line number Diff line number Diff line
@@ -77,19 +77,6 @@ MediaBuffer::MediaBuffer(size_t size) 
    }

}



MediaBuffer::MediaBuffer(const sp<GraphicBuffer>& graphicBuffer)

    : mObserver(NULL),

      mRefCount(0),

      mData(NULL),

      mSize(1),

      mRangeOffset(0),

      mRangeLength(mSize),

      mGraphicBuffer(graphicBuffer),

      mOwnsData(false),

      mMetaData(new MetaData),

      mOriginal(NULL) {

}



MediaBuffer::MediaBuffer(const sp<ABuffer> &buffer)

    : mObserver(NULL),

      mRefCount(0),
@@ -135,12 +122,10 @@ void MediaBuffer::add_ref() { 
}



void *MediaBuffer::data() const {

    CHECK(mGraphicBuffer == NULL);

    return mData;

}



size_t MediaBuffer::size() const {

    CHECK(mGraphicBuffer == NULL);

    return mSize;

}
@@ -153,19 +138,15 @@ size_t MediaBuffer::range_length() const { 
}



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

    if ((mGraphicBuffer == NULL) && (offset + length > mSize)) {

    if (offset + length > mSize) {

        ALOGE("offset = %zu, length = %zu, mSize = %zu", offset, length, mSize);

    }

    CHECK((mGraphicBuffer != NULL) || (offset + length <= mSize));

    CHECK(offset + length <= mSize);



    mRangeOffset = offset;

    mRangeLength = length;

}



sp<GraphicBuffer> MediaBuffer::graphicBuffer() const {

    return mGraphicBuffer;

}



sp<MetaData> MediaBuffer::meta_data() {

    return mMetaData;

}
@@ -199,8 +180,6 @@ void MediaBuffer::setObserver(MediaBufferObserver *observer) { 
}



MediaBuffer *MediaBuffer::clone() {

    CHECK(mGraphicBuffer == NULL);



    MediaBuffer *buffer = new MediaBuffer(mData, mSize);

    buffer->set_range(mRangeOffset, mRangeLength);

    buffer->mMetaData = new MetaData(*mMetaData.get());

media/libstagefright/include/media/stagefright/MediaBuffer.h

+0 −5
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ public: 


    explicit MediaBuffer(size_t size);



    explicit MediaBuffer(const sp<GraphicBuffer>& graphicBuffer);



    explicit MediaBuffer(const sp<ABuffer> &buffer);



    MediaBuffer(const sp<IMemory> &mem) :
@@ -88,8 +86,6 @@ public: 


    void set_range(size_t offset, size_t length);



    sp<GraphicBuffer> graphicBuffer() const;



    sp<MetaData> meta_data();



    // Clears meta data and resets the range to the full extent.
@@ -167,7 +163,6 @@ private: 


    void *mData;

    size_t mSize, mRangeOffset, mRangeLength;

    sp<GraphicBuffer> mGraphicBuffer;

    sp<ABuffer> mBuffer;



    bool mOwnsData;