ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Roll back recent change"

This commit is contained in:
Andy McFadden 2013-08-02 22:34:13 +00:00 committed by Android (Google) Code Review
parent c1c39f8807 4b49e08385
commit d9ba9707b0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gui/BufferQueue.cpp
View File

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

4
libs/gui/Surface.cpp
View File

@ -263,7 +263,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) {
Mutex::Autolock lock(mMutex);
int64_t timestamp;
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 {
timestamp = mTimestamp;
}