OSDN Git Service

Fix BufferHubQueueProducer::dequeueBuffer
authorJiwen 'Steve' Cai <jwcai@google.com>
Mon, 8 May 2017 23:02:36 +0000 (16:02 -0700)
committerJiwen Cai <jiwen@google.com>
Mon, 8 May 2017 23:27:31 +0000 (23:27 +0000)
Seems this might just be a rebase glitch.

Bug: 38137230
Test: buffer_hub_queue_producer-test
Change-Id: I94ce059475fad4cf31cec52a9661eb6fc9cd2e00

libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp

index 0a36156..435cba4 100644 (file)
@@ -140,10 +140,10 @@ status_t BufferHubQueueProducer::dequeueBuffer(
     LocalHandle fence;
     auto buffer_status  =
         core_->producer_->Dequeue(core_->dequeue_timeout_ms_, &slot, &fence);
-    if (!buffer_producer)
-      return NO_MEMORY;
 
     buffer_producer = buffer_status.take();
+    if (!buffer_producer)
+      return NO_MEMORY;
 
     if (width == buffer_producer->width() &&
         height == buffer_producer->height() &&