diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-08-30 18:23:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 18:23:27 -0700 |
| commit | 1847f7fd799f92300b3786e49f5883eaa03f4507 (patch) | |
| tree | e0ea1ba01bffd276e628a5de013f20f09a13507f /include/gui | |
| parent | 2b9776982360a234803665cb79e8abcfeb0e3c79 (diff) | |
| parent | e191e6c34829aec406a9cfe3e95211f884a311ff (diff) | |
| download | frameworks_native-1847f7fd799f92300b3786e49f5883eaa03f4507.zip frameworks_native-1847f7fd799f92300b3786e49f5883eaa03f4507.tar.gz frameworks_native-1847f7fd799f92300b3786e49f5883eaa03f4507.tar.bz2 | |
Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/BufferQueue.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h index 20cb69e..5b68b05 100644 --- a/include/gui/BufferQueue.h +++ b/include/gui/BufferQueue.h @@ -307,6 +307,19 @@ private: // given the current BufferQueue state. int getMinMaxBufferCountLocked() const; + // getMaxBufferCountLocked returns the maximum number of buffers that can + // be allocated at once. This value depends upon the following member + // variables: + // + // mSynchronousMode + // mMinUndequeuedBuffers + // mDefaultMaxBufferCount + // mOverrideMaxBufferCount + // + // Any time one of these member variables is changed while a producer is + // connected, mDequeueCondition must be broadcast. + int getMaxBufferCountLocked() const; + struct BufferSlot { BufferSlot() @@ -433,10 +446,6 @@ private: // not dequeued at any time int mMinUndequeuedBuffers; - // mMaxBufferCount is the maximum number of buffers that will be allocated - // at once. - int mMaxBufferCount; - // mDefaultMaxBufferCount is the default limit on the number of buffers // that will be allocated at one time. This default limit is set by the // consumer. The limit (as opposed to the default limit) may be |