Flush FastCapture PipeReader when starting after stop
Discards stale frames.
Bug: 30199985
Change-Id: Ie93a3784bf052aba6989d2ff1be92b1980b0c207
diff --git a/media/libnbaio/PipeReader.cpp b/media/libnbaio/PipeReader.cpp
index a879647..799e435 100644
--- a/media/libnbaio/PipeReader.cpp
+++ b/media/libnbaio/PipeReader.cpp
@@ -45,6 +45,7 @@
ALOG_ASSERT(readers > 0);
}
+__attribute__((no_sanitize("integer")))
ssize_t PipeReader::availableToRead()
{
if (CC_UNLIKELY(!mNegotiated)) {
@@ -64,6 +65,7 @@
return avail;
}
+__attribute__((no_sanitize("integer")))
ssize_t PipeReader::read(void *buffer, size_t count)
{
ssize_t avail = availableToRead();
@@ -97,4 +99,19 @@
return red;
}
+__attribute__((no_sanitize("integer")))
+ssize_t PipeReader::flush()
+{
+ if (CC_UNLIKELY(!mNegotiated)) {
+ return NEGOTIATE;
+ }
+ const int32_t rear = android_atomic_acquire_load(&mPipe.mRear);
+ const size_t flushed = rear - mFront;
+ // We don't check if flushed > mPipe.mMaxFrames (an overrun occurred) as the
+ // distinction is unimportant; all data is dropped.
+ mFront = rear;
+ mFramesRead += flushed; // we consider flushed frames as read.
+ return flushed;
+}
+
} // namespace android