| commit | d58445d917538a71f1519be7a3e7b9101fd9c0ca | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 17 22:58:43 2016 -0700 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 17 22:58:43 2016 -0700 |
| tree | 778d9c966ad2431f63425ab84ee85cabf5aff3bc | |
| parent | 4dead6f3c81a8f21b71c7baedfe9cb73e112e167 [diff] [blame] | |
| parent | 3fce3ef7df0393bdbca33cfb05f084a510155cd2 [diff] [blame] |
resolve merge conflicts of 3fce3ef to nyc-mr1-dev-plus-aosp Change-Id: If319afe3976bedd64226e128164457f461eb7042
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