| commit | e849af8737d9302a7b24fa2f0083cde01c9cd4fc | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Thu Mar 12 15:21:16 2015 -0700 |
| committer | Dan Stoza <stoza@google.com> | Tue Apr 07 13:05:57 2015 -0700 |
| tree | 2822190c54802f688b867ff68370bad9316b11ee | |
| parent | 39a8a37759b6964b29b721b83079642c38ec417e [diff] |
Cherry-pick two BufferItem changes libcameraservice: Stop using IGBC::BufferItem (cherry picked from commit 027c772ed30ddd32808df669e37a53e9b97b1f99) libstagefright: Stop using IGBC::BufferItem (cherry picked from commit 983e2be81f9ea767ae4d8b19669c1c080ecf58d4)
diff --git a/services/camera/libcameraservice/device3/Camera3InputStream.cpp b/services/camera/libcameraservice/device3/Camera3InputStream.cpp index 319be1d..9c1e28b 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 @@ private: - typedef BufferItemConsumer::BufferItem BufferItem; - sp<BufferItemConsumer> mConsumer; Vector<BufferItem> mBuffersInFlight;