diff options
| author | 2015-05-13 16:34:05 +0000 | |
|---|---|---|
| committer | 2015-05-13 16:34:07 +0000 | |
| commit | 09d561dbee9a28db9632ff3d51f633c18aefe023 (patch) | |
| tree | f7a506ad537346fbaa00564db15328992de40d26 /include/gui/ConsumerBase.h | |
| parent | 4b4820db4b83875ec5bbae11e468f36f21e5334c (diff) | |
| parent | a4650a50a0b35e9e4342d6600b6eb24fd94bb8e5 (diff) | |
Merge "Fix PTS handling for buffer replacement" into mnc-dev
Diffstat (limited to 'include/gui/ConsumerBase.h')
| -rw-r--r-- | include/gui/ConsumerBase.h | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index 5be3ffb8d3..f46bf014f1 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -152,7 +152,8 @@ protected:      // initialization that must take place the first time a buffer is assigned      // to a slot.  If it is overridden the derived class's implementation must      // call ConsumerBase::acquireBufferLocked. -    virtual status_t acquireBufferLocked(BufferItem *item, nsecs_t presentWhen); +    virtual status_t acquireBufferLocked(BufferItem *item, nsecs_t presentWhen, +            uint64_t maxFrameNumber = 0);      // releaseBufferLocked relinquishes control over a buffer, returning that      // control to the BufferQueue.  |