| commit | e8a984e43504890e0f676256a0445b9917a2af91 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 17 22:14:01 2016 -0700 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 17 22:15:06 2016 -0700 |
| tree | fbbf92929438537ef1e8929d9ebc77c0e219cf4c | |
| parent | 9ec10a72bf56471a8afea7b8a7aaa705ef7d7cca [diff] [blame] | |
| parent | 77c1a3554275a51ac8eb9fbe86f476afc8983192 [diff] [blame] |
resolve merge conflicts of 77c1a35 to nyc-mr1-dev Change-Id: I18c301c55904c06b3f6f5d8eaa2df47ff87ddb4f
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStreamInterface.h b/services/camera/libcameraservice/device3/Camera3OutputStreamInterface.h index 7c09c40..3f83c89 100644 --- a/services/camera/libcameraservice/device3/Camera3OutputStreamInterface.h +++ b/services/camera/libcameraservice/device3/Camera3OutputStreamInterface.h
@@ -49,6 +49,16 @@ * Set the consumer surface to the output stream. */ virtual status_t setConsumer(sp<Surface> consumer) = 0; + + /** + * Detach an unused buffer from the stream. + * + * buffer must be non-null; fenceFd may null, and if it is non-null, but + * there is no valid fence associated with the detached buffer, it will be + * set to -1. + * + */ + virtual status_t detachBuffer(sp<GraphicBuffer>* buffer, int* fenceFd) = 0; }; } // namespace camera3