summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiwen 'Steve' Cai <jwcai@google.com> 2017-10-10 17:48:53 -0700
committer Jiwen 'Steve' Cai <jwcai@google.com> 2017-10-10 17:55:05 -0700
commit068f755882884a180feaf1a37e287bb5d01460d1 (patch)
tree68bcd003c17401c07c7e4273316a247802274f72
parentbdacb1dce4a17cfaa6629e287565c5f68f8f4f62 (diff)
Revert "Comment out unused parameter."
This reverts commit a548ce9f118392bfa867481d4e47423fc7bfc3d8. Need to temporarily revert this CL to let ag/3019931 merged in from oc-mr1-dev. Bug: 65455724 Test: Normal build with and wihout ag/3019931 Change-Id: Id27a48187bb7eb7f84532108712fa0b32fb84974
-rw-r--r--libs/vr/libdvr/dvr_buffer_queue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/vr/libdvr/dvr_buffer_queue.cpp b/libs/vr/libdvr/dvr_buffer_queue.cpp
index a4c953624a..035252d0b9 100644
--- a/libs/vr/libdvr/dvr_buffer_queue.cpp
+++ b/libs/vr/libdvr/dvr_buffer_queue.cpp
@@ -151,7 +151,7 @@ int DvrWriteBufferQueue::Dequeue(int timeout, DvrWriteBuffer* write_buffer,
int DvrWriteBufferQueue::GainBuffer(int timeout,
DvrWriteBuffer** out_write_buffer,
- DvrNativeBufferMetadata* /* out_meta */,
+ DvrNativeBufferMetadata* out_meta,
int* out_fence_fd) {
DvrWriteBuffer write_buffer;
int fence_fd;
@@ -438,7 +438,7 @@ int DvrReadBufferQueue::AcquireBuffer(int timeout,
}
int DvrReadBufferQueue::ReleaseBuffer(DvrReadBuffer* read_buffer,
- const DvrNativeBufferMetadata* /* meta */,
+ const DvrNativeBufferMetadata* meta,
int release_fence_fd) {
LOG_FATAL_IF(
(read_buffers->slot < 0 || read_buffers->slot >= read_buffers_size()),