summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-02-27 18:11:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-27 18:11:05 +0000
commit2c86f533c622e175b3ed77f40216a0891f9cc785 (patch)
tree5337c8049dd69ca5a07768e0844189c74959ba57 /include
parent68189471332964a65f0d1f47cda7724c562c566d (diff)
parent409e3749a5627f1b360feb1479fcd341067a90b8 (diff)
downloadframeworks_av-2c86f533c622e175b3ed77f40216a0891f9cc785.zip
frameworks_av-2c86f533c622e175b3ed77f40216a0891f9cc785.tar.gz
frameworks_av-2c86f533c622e175b3ed77f40216a0891f9cc785.tar.bz2
Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioBufferProvider.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/media/AudioBufferProvider.h b/include/media/AudioBufferProvider.h
index 865ed7e..43e4de7 100644
--- a/include/media/AudioBufferProvider.h
+++ b/include/media/AudioBufferProvider.h
@@ -36,11 +36,8 @@ public:
size_t frameCount;
};
-protected:
- AudioBufferProvider() : mValid(kValid) { }
- virtual ~AudioBufferProvider() { mValid = kDead; }
+ virtual ~AudioBufferProvider() {}
-public:
// value representing an invalid presentation timestamp
static const int64_t kInvalidPTS = 0x7FFFFFFFFFFFFFFFLL; // <stdint.h> is too painful
@@ -50,13 +47,6 @@ public:
virtual status_t getNextBuffer(Buffer* buffer, int64_t pts = kInvalidPTS) = 0;
virtual void releaseBuffer(Buffer* buffer) = 0;
-
- int getValid() const { return mValid; }
- static const int kValid = 'GOOD';
- static const int kDead = 'DEAD';
-
-private:
- int mValid;
};
// ----------------------------------------------------------------------------