commit 81f93f8176fa30083b3fbf641278b8e17ccd6144
author Marco Nelissen <marcone@google.com> Mon Oct 26 21:42:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 26 21:42:31 2015 +0000
tree 9fe3cc7349890a041fca4b51c022c660fb31f823
parent b2d37608d3881dcf4455fc43b51c38e0fcebba95
parent cb0f20a3138d3e1d5586fd127c4f2f6c05e78a48

Merge "ABuffer: remove unused code" am: d0f8fa383e
am: cb0f20a313

* commit 'cb0f20a3138d3e1d5586fd127c4f2f6c05e78a48':
  ABuffer: remove unused code

include/media/stagefright/foundation/ABuffer.h

diff --git a/include/media/stagefright/foundation/ABuffer.h b/include/media/stagefright/foundation/ABuffer.h
index 6294ee7..dc9c778 100644
--- a/include/media/stagefright/foundation/ABuffer.h
+++ b/include/media/stagefright/foundation/ABuffer.h
@@ -33,8 +33,6 @@
     ABuffer(size_t capacity);
     ABuffer(void *data, size_t capacity);
 
-    void setFarewellMessage(const sp<AMessage> msg);
-
     uint8_t *base() { return (uint8_t *)mData; }
     uint8_t *data() { return (uint8_t *)mData + mRangeOffset; }
     size_t capacity() const { return mCapacity; }
@@ -58,7 +56,6 @@
     virtual ~ABuffer();
 
 private:
-    sp<AMessage> mFarewell;
     sp<AMessage> mMeta;
 
     MediaBufferBase *mMediaBufferBase;

media/libstagefright/foundation/ABuffer.cpp

diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp
index a5b81a8..804046a 100644
--- a/media/libstagefright/foundation/ABuffer.cpp
+++ b/media/libstagefright/foundation/ABuffer.cpp
@@ -67,10 +67,6 @@
         }
     }
 
-    if (mFarewell != NULL) {
-        mFarewell->post();
-    }
-
     setMediaBufferBase(NULL);
 }
 
@@ -82,10 +78,6 @@
     mRangeLength = size;
 }
 
-void ABuffer::setFarewellMessage(const sp<AMessage> msg) {
-    mFarewell = msg;
-}
-
 sp<AMessage> ABuffer::meta() {
     if (mMeta == NULL) {
         mMeta = new AMessage;