commit 58b1b4ec8d71ef86afde643832dcfdbf4bbe4bda
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Oct 15 12:18:36 2018 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Mon Nov 12 10:50:13 2018 -0800
tree 9620815e54b1e6822a8b2620825a6482bc0612d0
parent 30ab5ed62fecb96078fb8ece767a66ef794bcb12

Camera: handle HAL buffer manager + stream sharing case

Test: CTS MultiViewTest
Bug: 109829698
Change-Id: I98a7438d6bb9c01f95ae69c7556d7ed965629410

services/camera/libcameraservice/device3/Camera3IOStreamBase.h

diff --git a/services/camera/libcameraservice/device3/Camera3IOStreamBase.h b/services/camera/libcameraservice/device3/Camera3IOStreamBase.h
index 48e9bbf..750f64d 100644
--- a/services/camera/libcameraservice/device3/Camera3IOStreamBase.h
+++ b/services/camera/libcameraservice/device3/Camera3IOStreamBase.h
@@ -66,12 +66,14 @@
     status_t         returnAnyBufferLocked(
             const camera3_stream_buffer &buffer,
             nsecs_t timestamp,
-            bool output);
+            bool output,
+            const std::vector<size_t>& surface_ids = std::vector<size_t>());
 
     virtual status_t returnBufferCheckedLocked(
             const camera3_stream_buffer &buffer,
             nsecs_t timestamp,
             bool output,
+            const std::vector<size_t>& surface_ids,
             /*out*/
             sp<Fence> *releaseFenceOut) = 0;