virtual uint64_t getNextFrameNumber() const override;
// See IGraphicBufferProducer::setSingleBufferMode
- virtual status_t setSingleBufferMode(bool singleBufferMode);
+ virtual status_t setSingleBufferMode(bool singleBufferMode) override;
+
+ // See IGraphicBufferProducer::setDequeueTimeout
+ virtual status_t setDequeueTimeout(nsecs_t timeout) override;
private:
// This is required by the IBinder::DeathRecipient interface
int mCurrentCallbackTicket; // Protected by mCallbackMutex
Condition mCallbackCondition;
+ // Sets how long dequeueBuffer or attachBuffer will block if a buffer or
+ // slot is not yet available.
+ nsecs_t mDequeueTimeout;
+
}; // class BufferQueueProducer
} // namespace android
// * WOULD_BLOCK - no buffer is currently available, and blocking is disabled
// since both the producer/consumer are controlled by app
// * NO_MEMORY - out of memory, cannot allocate the graphics buffer.
+ // * TIMED_OUT - the timeout set by setDequeueTimeout was exceeded while
+ // waiting for a buffer to become available.
//
// All other negative values are an unknown error returned downstream
// from the graphics allocator (typically errno).
// * WOULD_BLOCK - no buffer slot is currently available, and blocking is
// disabled since both the producer/consumer are
// controlled by the app.
+ // * TIMED_OUT - the timeout set by setDequeueTimeout was exceeded while
+ // waiting for a slot to become available.
virtual status_t attachBuffer(int* outSlot,
const sp<GraphicBuffer>& buffer) = 0;
// and returned to all calls to dequeueBuffer and acquireBuffer. This allows
// the producer and consumer to simultaneously access the same buffer.
virtual status_t setSingleBufferMode(bool singleBufferMode) = 0;
+
+ // Sets how long dequeueBuffer will wait for a buffer to become available
+ // before returning an error (TIMED_OUT).
+ //
+ // This timeout also affects the attachBuffer call, which will block if
+ // there is not a free slot available into which the attached buffer can be
+ // placed.
+ //
+ // By default, the BufferQueue will wait forever, which is indicated by a
+ // timeout of -1. If set (to a value other than -1), this will disable
+ // non-blocking mode and its corresponding spare buffer (which is used to
+ // ensure a buffer is always available).
+ virtual status_t setDequeueTimeout(nsecs_t timeout) = 0;
};
// ----------------------------------------------------------------------------
* in <system/window.h>. */
int setScalingMode(int mode);
+ // See IGraphicBufferProducer::setDequeueTimeout
+ status_t setDequeueTimeout(nsecs_t timeout);
+
protected:
virtual ~Surface();
mCallbackMutex(),
mNextCallbackTicket(0),
mCurrentCallbackTicket(0),
- mCallbackCondition() {}
+ mCallbackCondition(),
+ mDequeueTimeout(-1) {}
BufferQueueProducer::~BufferQueueProducer() {}
(acquiredCount <= mCore->mMaxAcquiredBufferCount)) {
return WOULD_BLOCK;
}
- mCore->mDequeueCondition.wait(mCore->mMutex);
+ if (mDequeueTimeout >= 0) {
+ status_t result = mCore->mDequeueCondition.waitRelative(
+ mCore->mMutex, mDequeueTimeout);
+ if (result == TIMED_OUT) {
+ return result;
+ }
+ } else {
+ mCore->mDequeueCondition.wait(mCore->mMutex);
+ }
}
} // while (tryAgain)
}
mCore->mBufferHasBeenQueued = false;
- mCore->mDequeueBufferCannotBlock = mCore->mConsumerControlledByApp &&
- producerControlledByApp;
+ mCore->mDequeueBufferCannotBlock = false;
+ if (mDequeueTimeout < 0) {
+ mCore->mDequeueBufferCannotBlock =
+ mCore->mConsumerControlledByApp && producerControlledByApp;
+ }
mCore->mAllowAllocation = true;
return status;
mCore->mSingleBufferSlot = BufferQueueCore::INVALID_BUFFER_SLOT;
}
mCore->mSingleBufferMode = singleBufferMode;
+ return NO_ERROR;
+}
+
+status_t BufferQueueProducer::setDequeueTimeout(nsecs_t timeout) {
+ ATRACE_CALL();
+ BQ_LOGV("setDequeueTimeout: %" PRId64, timeout);
+ Mutex::Autolock lock(mCore->mMutex);
+ mDequeueTimeout = timeout;
+ mCore->mDequeueBufferCannotBlock = false;
return NO_ERROR;
}
SET_MAX_DEQUEUED_BUFFER_COUNT,
SET_ASYNC_MODE,
GET_NEXT_FRAME_NUMBER,
- SET_SINGLE_BUFFER_MODE
+ SET_SINGLE_BUFFER_MODE,
+ SET_DEQUEUE_TIMEOUT,
};
class BpGraphicBufferProducer : public BpInterface<IGraphicBufferProducer>
}
return result;
}
+
+ virtual status_t setDequeueTimeout(nsecs_t timeout) {
+ Parcel data, reply;
+ data.writeInterfaceToken(IGraphicBufferProducer::getInterfaceDescriptor());
+ data.writeInt64(timeout);
+ status_t result = remote()->transact(SET_DEQUEUE_TIMEOUT, data, &reply);
+ if (result != NO_ERROR) {
+ ALOGE("setDequeueTimeout failed to transact: %d", result);
+ return result;
+ }
+ return reply.readInt32();
+ }
};
// Out-of-line virtual method definition to trigger vtable emission in this
reply->writeInt32(result);
return NO_ERROR;
}
+ case SET_DEQUEUE_TIMEOUT: {
+ CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
+ nsecs_t timeout = data.readInt64();
+ status_t result = setDequeueTimeout(timeout);
+ reply->writeInt32(result);
+ return NO_ERROR;
+ }
}
return BBinder::onTransact(code, data, reply, flags);
}
return mGraphicBufferProducer->getConsumerName();
}
+status_t Surface::setDequeueTimeout(nsecs_t timeout) {
+ return mGraphicBufferProducer->setDequeueTimeout(timeout);
+}
+
int Surface::hook_setSwapInterval(ANativeWindow* window, int interval) {
Surface* c = getSelf(window);
return c->setSwapInterval(interval);
}
}
+TEST_F(BufferQueueTest, TestTimeouts) {
+ createBufferQueue();
+ sp<DummyConsumer> dc(new DummyConsumer);
+ ASSERT_EQ(OK, mConsumer->consumerConnect(dc, true));
+ IGraphicBufferProducer::QueueBufferOutput output;
+ ASSERT_EQ(OK, mProducer->connect(new DummyProducerListener,
+ NATIVE_WINDOW_API_CPU, true, &output));
+
+ // Fill up the queue. Since the controlledByApp flags are set to true, this
+ // queue should be in non-blocking mode, and we should be recycling the same
+ // two buffers
+ for (int i = 0; i < 5; ++i) {
+ int slot = BufferQueue::INVALID_BUFFER_SLOT;
+ sp<Fence> fence = Fence::NO_FENCE;
+ auto result = mProducer->dequeueBuffer(&slot, &fence, 0, 0, 0, 0);
+ if (i < 2) {
+ ASSERT_EQ(IGraphicBufferProducer::BUFFER_NEEDS_REALLOCATION,
+ result);
+ } else {
+ ASSERT_EQ(OK, result);
+ }
+ sp<GraphicBuffer> buffer;
+ ASSERT_EQ(OK, mProducer->requestBuffer(slot, &buffer));
+ IGraphicBufferProducer::QueueBufferInput input(0ull, true,
+ HAL_DATASPACE_UNKNOWN, Rect::INVALID_RECT,
+ NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, Fence::NO_FENCE);
+ IGraphicBufferProducer::QueueBufferOutput output{};
+ ASSERT_EQ(OK, mProducer->queueBuffer(slot, input, &output));
+ }
+
+ const auto TIMEOUT = ms2ns(250);
+ mProducer->setDequeueTimeout(TIMEOUT);
+
+ // Setting a timeout will change the BufferQueue into blocking mode (with
+ // one droppable buffer in the queue and one free from the previous
+ // dequeue/queues), so dequeue and queue two more buffers: one to replace
+ // the current droppable buffer, and a second to max out the buffer count
+ sp<GraphicBuffer> buffer; // Save a buffer to attach later
+ for (int i = 0; i < 2; ++i) {
+ int slot = BufferQueue::INVALID_BUFFER_SLOT;
+ sp<Fence> fence = Fence::NO_FENCE;
+ ASSERT_EQ(OK, mProducer->dequeueBuffer(&slot, &fence, 0, 0, 0, 0));
+ ASSERT_EQ(OK, mProducer->requestBuffer(slot, &buffer));
+ IGraphicBufferProducer::QueueBufferInput input(0ull, true,
+ HAL_DATASPACE_UNKNOWN, Rect::INVALID_RECT,
+ NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, Fence::NO_FENCE);
+ ASSERT_EQ(OK, mProducer->queueBuffer(slot, input, &output));
+ }
+
+ int slot = BufferQueue::INVALID_BUFFER_SLOT;
+ sp<Fence> fence = Fence::NO_FENCE;
+ auto startTime = systemTime();
+ ASSERT_EQ(TIMED_OUT, mProducer->dequeueBuffer(&slot, &fence, 0, 0, 0, 0));
+ ASSERT_GE(systemTime() - startTime, TIMEOUT);
+
+ // We're technically attaching the same buffer multiple times (since we
+ // queued it previously), but that doesn't matter for this test
+ startTime = systemTime();
+ ASSERT_EQ(TIMED_OUT, mProducer->attachBuffer(&slot, buffer));
+ ASSERT_GE(systemTime() - startTime, TIMEOUT);
+}
+
} // namespace android
return mSource[SOURCE_SINK]->setSingleBufferMode(singleBufferMode);
}
+status_t VirtualDisplaySurface::setDequeueTimeout(nsecs_t /* timeout */) {
+ ALOGE("setDequeueTimeout not supported on VirtualDisplaySurface");
+ return INVALID_OPERATION;
+}
+
void VirtualDisplaySurface::updateQueueBufferOutput(
const QueueBufferOutput& qbo) {
uint32_t w, h, transformHint, numPendingBuffers;
virtual status_t setGenerationNumber(uint32_t generationNumber);
virtual String8 getConsumerName() const override;
virtual uint64_t getNextFrameNumber() const override;
- virtual status_t setSingleBufferMode(bool singleBufferMode);
+ virtual status_t setSingleBufferMode(bool singleBufferMode) override;
+ virtual status_t setDequeueTimeout(nsecs_t timeout) override;
//
// Utility methods
return mProducer->setSingleBufferMode(singleBufferMode);
}
+status_t MonitoredProducer::setDequeueTimeout(nsecs_t timeout) {
+ return mProducer->setDequeueTimeout(timeout);
+}
+
IBinder* MonitoredProducer::onAsBinder() {
return IInterface::asBinder(mProducer).get();
}
virtual status_t setGenerationNumber(uint32_t generationNumber);
virtual String8 getConsumerName() const override;
virtual uint64_t getNextFrameNumber() const override;
+ virtual status_t setDequeueTimeout(nsecs_t timeout) override;
virtual IBinder* onAsBinder();
virtual status_t setSingleBufferMode(bool singleBufferMode);
OSDN Git Service
