Remove unused methods in Media(Source|Buffer)
Test: make checkbuild
Bug: 67908542
Change-Id: I56346f75a8c5f87b7090c02e6248fedcd5a19cf9
diff --git a/media/libmediaextractor/MediaSource.cpp b/media/libmediaextractor/MediaSource.cpp
index 8038a59..a5d41f7 100644
--- a/media/libmediaextractor/MediaSource.cpp
+++ b/media/libmediaextractor/MediaSource.cpp
@@ -32,7 +32,6 @@
void MediaSource::ReadOptions::reset() {
mOptions = 0;
mSeekTimeUs = 0;
- mLatenessUs = 0;
mNonBlocking = false;
}
@@ -67,12 +66,4 @@
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
diff --git a/media/libmediaextractor/include/media/MediaSource.h b/media/libmediaextractor/include/media/MediaSource.h
index 504653b..f088186 100644
--- a/media/libmediaextractor/include/media/MediaSource.h
+++ b/media/libmediaextractor/include/media/MediaSource.h
@@ -72,10 +72,6 @@
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 @@
uint32_t mOptions;
int64_t mSeekTimeUs;
SeekMode mSeekMode;
- int64_t mLatenessUs;
bool mNonBlocking;
} __attribute__((packed)); // sent through Binder
diff --git a/media/libstagefright/foundation/MediaBuffer.cpp b/media/libstagefright/foundation/MediaBuffer.cpp
index 16000ef..95951dd 100644
--- a/media/libstagefright/foundation/MediaBuffer.cpp
+++ b/media/libstagefright/foundation/MediaBuffer.cpp
@@ -77,19 +77,6 @@
}
}
-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::data() const {
- CHECK(mGraphicBuffer == NULL);
return mData;
}
size_t MediaBuffer::size() const {
- CHECK(mGraphicBuffer == NULL);
return mSize;
}
@@ -153,19 +138,15 @@
}
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 @@
}
MediaBuffer *MediaBuffer::clone() {
- CHECK(mGraphicBuffer == NULL);
-
MediaBuffer *buffer = new MediaBuffer(mData, mSize);
buffer->set_range(mRangeOffset, mRangeLength);
buffer->mMetaData = new MetaData(*mMetaData.get());
diff --git a/media/libstagefright/include/media/stagefright/MediaBuffer.h b/media/libstagefright/include/media/stagefright/MediaBuffer.h
index e74410d..367a467 100644
--- a/media/libstagefright/include/media/stagefright/MediaBuffer.h
+++ b/media/libstagefright/include/media/stagefright/MediaBuffer.h
@@ -58,8 +58,6 @@
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 @@
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 @@
void *mData;
size_t mSize, mRangeOffset, mRangeLength;
- sp<GraphicBuffer> mGraphicBuffer;
sp<ABuffer> mBuffer;
bool mOwnsData;