diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 13:44:19 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 14:52:26 -0700 |
| commit | 727d172137b4f32681c098de8e2623c0b65a6406 (patch) | |
| tree | 8e7a403274d5a770ecd473d6ef66f3a5f32f45da /services/camera/libcameraservice/device2 | |
| parent | 9a17941fa70e43119d2c3464bc00a3cd30b2bd14 (diff) | |
| download | frameworks_av-727d172137b4f32681c098de8e2623c0b65a6406.zip frameworks_av-727d172137b4f32681c098de8e2623c0b65a6406.tar.gz frameworks_av-727d172137b4f32681c098de8e2623c0b65a6406.tar.bz2 | |
CameraService: Add consumer name to output stream dumpsys
Also switch use of ANativeWindow to Surface, to get to the
getConsumerName() method where necessary.
Surface can always be cast to ANativeWindow, but not the other way
around, so it's a better option anyway.
Change-Id: Ie5c2d30821c1a754f9e382699ff50b4b328288b3
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index 88f555b..dfe5565 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -240,7 +240,7 @@ status_t Camera2Device::waitUntilRequestReceived(int32_t requestId, nsecs_t time return mRequestQueue.waitForDequeue(requestId, timeout); } -status_t Camera2Device::createStream(sp<ANativeWindow> consumer, +status_t Camera2Device::createStream(sp<Surface> consumer, uint32_t width, uint32_t height, int format, android_dataspace /*dataSpace*/, camera3_stream_rotation_t rotation, int *id) { ATRACE_CALL(); diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h index a001a91..c9f3a2c 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.h +++ b/services/camera/libcameraservice/device2/Camera2Device.h @@ -56,7 +56,7 @@ class Camera2Device: public CameraDeviceBase { int64_t *lastFrameNumber = NULL); virtual status_t clearStreamingRequest(int64_t *lastFrameNumber = NULL); virtual status_t waitUntilRequestReceived(int32_t requestId, nsecs_t timeout); - virtual status_t createStream(sp<ANativeWindow> consumer, + virtual status_t createStream(sp<Surface> consumer, uint32_t width, uint32_t height, int format, android_dataspace dataSpace, camera3_stream_rotation_t rotation, int *id); virtual status_t createInputStream( |