diff options
| author | Dan Stoza <stoza@google.com> | 2015-03-12 15:21:16 -0700 |
|---|---|---|
| committer | Dan Stoza <stoza@google.com> | 2015-03-12 15:21:16 -0700 |
| commit | 549e735c2ca22d16eea32fda418ba80da32a8558 (patch) | |
| tree | c4a5b46fa5803d7ac0520c4eaafb8cef54b4989e /services/camera/libcameraservice/device3 | |
| parent | 3f27436a9346f043f52265da1e6a74cde2bffd4d (diff) | |
| download | frameworks_av-549e735c2ca22d16eea32fda418ba80da32a8558.zip frameworks_av-549e735c2ca22d16eea32fda418ba80da32a8558.tar.gz frameworks_av-549e735c2ca22d16eea32fda418ba80da32a8558.tar.bz2 | |
libcameraservice: Stop using IGBC::BufferItem
Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui. Depends on
frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9.
Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
Diffstat (limited to 'services/camera/libcameraservice/device3')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3InputStream.cpp | 1 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3InputStream.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3InputStream.cpp b/services/camera/libcameraservice/device3/Camera3InputStream.cpp index 85ed88d..87907bf 100644 --- a/services/camera/libcameraservice/device3/Camera3InputStream.cpp +++ b/services/camera/libcameraservice/device3/Camera3InputStream.cpp @@ -18,6 +18,7 @@ #define ATRACE_TAG ATRACE_TAG_CAMERA //#define LOG_NDEBUG 0 +#include <gui/BufferItem.h> #include <utils/Log.h> #include <utils/Trace.h> #include "Camera3InputStream.h" diff --git a/services/camera/libcameraservice/device3/Camera3InputStream.h b/services/camera/libcameraservice/device3/Camera3InputStream.h index ae49467..fd17f4f 100644 --- a/services/camera/libcameraservice/device3/Camera3InputStream.h +++ b/services/camera/libcameraservice/device3/Camera3InputStream.h @@ -48,8 +48,6 @@ class Camera3InputStream : public Camera3IOStreamBase { private: - typedef BufferItemConsumer::BufferItem BufferItem; - sp<BufferItemConsumer> mConsumer; Vector<BufferItem> mBuffersInFlight; |