Roll back recent change

Disable dropping of frames based on timestamp.  Resume auto-
generating timestamps in Surface.

Bug 10151804

Change-Id: I15de26158e1d7ef22a5b150e685a126dc48ae2b4
This commit is contained in:
Andy McFadden 2013-08-02 15:31:45 -07:00
parent 14fab7dd79
commit 4b49e08385
2 changed files with 4 additions and 2 deletions

View File

@ -855,7 +855,7 @@ status_t BufferQueue::acquireBuffer(BufferItem *buffer, nsecs_t expectedPresent)
// //
// NOTE: code assumes monotonic time values from the system clock are // NOTE: code assumes monotonic time values from the system clock are
// positive. // positive.
while (mQueue.size() > 1) { while (false && mQueue.size() > 1) {
// If entry[1] is timely, drop entry[0] (and repeat). We apply // If entry[1] is timely, drop entry[0] (and repeat). We apply
// an additional criteria here: we only drop the earlier buffer if // an additional criteria here: we only drop the earlier buffer if
// our desiredPresent falls within +/- 1 second of the expected // our desiredPresent falls within +/- 1 second of the expected

View File

@ -261,7 +261,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) {
Mutex::Autolock lock(mMutex); Mutex::Autolock lock(mMutex);
int64_t timestamp; int64_t timestamp;
if (mTimestamp == NATIVE_WINDOW_TIMESTAMP_AUTO) { if (mTimestamp == NATIVE_WINDOW_TIMESTAMP_AUTO) {
timestamp = 0; timestamp = systemTime(SYSTEM_TIME_MONOTONIC);
ALOGV("Surface::queueBuffer making up timestamp: %.2f ms",
timestamp / 1000000.f);
} else { } else {
timestamp = mTimestamp; timestamp = mTimestamp;
} }