summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-28 11:01:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-28 11:01:43 -0700
commite646b2d26459ca30667097e9600ee3f57ebfd228 (patch)
treedbebec26aba4bdc1d5d48e3d5ac1f7cb744f350e /include/media
parent24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b (diff)
parent96fc6cc65ca93009a759a3a874b82a35771b9714 (diff)
downloadframeworks_av-e646b2d26459ca30667097e9600ee3f57ebfd228.zip
frameworks_av-e646b2d26459ca30667097e9600ee3f57ebfd228.tar.gz
frameworks_av-e646b2d26459ca30667097e9600ee3f57ebfd228.tar.bz2
Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/SurfaceMediaSource.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h
index 9e07ea4..f60a535 100644
--- a/include/media/stagefright/SurfaceMediaSource.h
+++ b/include/media/stagefright/SurfaceMediaSource.h
@@ -52,6 +52,8 @@ class GraphicBuffer;
// may be dropped. It is possible to wait for the buffers to be
// returned (but not implemented)
+#define DEBUG_PENDING_BUFFERS 0
+
class SurfaceMediaSource : public MediaSource,
public MediaBufferObserver,
protected BufferQueue::ConsumerListener {
@@ -169,6 +171,10 @@ private:
size_t mNumPendingBuffers;
+#if DEBUG_PENDING_BUFFERS
+ Vector<MediaBuffer *> mPendingBuffers;
+#endif
+
// mCurrentTimestamp is the timestamp for the current texture. It
// gets set to mLastQueuedTimestamp each time updateTexImage is called.
int64_t mCurrentTimestamp;