summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-07-22 14:00:37 -0700
committerJamie Gennis <jgennis@google.com>2011-07-22 14:02:09 -0700
commit85eafc680a0bf5e0253cf611ac525769fc9bef3e (patch)
treec5e69ab10dd15be3b464db81b8f4e9382d8ea8e8
parentfe388eedca9f46ed3fee9579258acecd93e88641 (diff)
downloadframeworks_av-85eafc680a0bf5e0253cf611ac525769fc9bef3e.zip
frameworks_av-85eafc680a0bf5e0253cf611ac525769fc9bef3e.tar.gz
frameworks_av-85eafc680a0bf5e0253cf611ac525769fc9bef3e.tar.bz2
SurfaceMediaSource: remove getAllocator method
This change removes the getAllocator method from SurfaceMediaSource because that method is no longer a part of the ISurfaceTexture interface. Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
-rw-r--r--include/media/stagefright/SurfaceMediaSource.h7
-rw-r--r--media/libstagefright/SurfaceMediaSource.cpp6
2 files changed, 0 insertions, 13 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h
index e1852ec..6726d2d 100644
--- a/include/media/stagefright/SurfaceMediaSource.h
+++ b/include/media/stagefright/SurfaceMediaSource.h
@@ -163,13 +163,6 @@ public:
// when a new frame becomes available.
void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);
- // getAllocator retrieves the binder object that must be referenced as long
- // as the GraphicBuffers dequeued from this SurfaceMediaSource are referenced.
- // Holding this binder reference prevents SurfaceFlinger from freeing the
- // buffers before the client is done with them.
- sp<IBinder> getAllocator();
-
-
// getCurrentBuffer returns the buffer associated with the current image.
sp<GraphicBuffer> getCurrentBuffer() const;
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index db208dd..37b9b82 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -525,12 +525,6 @@ void SurfaceMediaSource::setFrameAvailableListener(
mFrameAvailableListener = listener;
}
-sp<IBinder> SurfaceMediaSource::getAllocator() {
- LOGV("getAllocator");
- return mGraphicBufferAlloc->asBinder();
-}
-
-
void SurfaceMediaSource::freeAllBuffers() {
LOGV("freeAllBuffers");
for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {