diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-23 15:19:19 -0800 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2015-03-06 10:38:55 -0800 |
commit | 3d82c0d9ed2b3e956ad699a9ca2c8a70c9d24678 (patch) | |
tree | 7f36bbbe98842a1b7cd46137afb853ad5d9b8fe1 /camera | |
parent | df68f07ca7cdeb500fcf101b317c61a0f0865723 (diff) | |
download | frameworks_av-3d82c0d9ed2b3e956ad699a9ca2c8a70c9d24678.zip frameworks_av-3d82c0d9ed2b3e956ad699a9ca2c8a70c9d24678.tar.gz frameworks_av-3d82c0d9ed2b3e956ad699a9ca2c8a70c9d24678.tar.bz2 |
Camera: Wire up dataSpace, clean up ICameraDeviceUser
- Remove unused arguments from ICameraDeviceUser::createStream
- Add dataSpace as a stream parameter, plumb it through everything
Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
Diffstat (limited to 'camera')
-rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index 277b5db..d1d63d5 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -208,14 +208,11 @@ public: return reply.readInt32(); } - virtual status_t createStream(int width, int height, int format, + virtual status_t createStream( const sp<IGraphicBufferProducer>& bufferProducer) { Parcel data, reply; data.writeInterfaceToken(ICameraDeviceUser::getInterfaceDescriptor()); - data.writeInt32(width); - data.writeInt32(height); - data.writeInt32(format); data.writeInt32(1); // marker that bufferProducer is not null data.writeString16(String16("unknown_name")); // name of surface @@ -396,14 +393,6 @@ status_t BnCameraDeviceUser::onTransact( } break; case CREATE_STREAM: { CHECK_INTERFACE(ICameraDeviceUser, data, reply); - int width, height, format; - - width = data.readInt32(); - ALOGV("%s: CREATE_STREAM: width = %d", __FUNCTION__, width); - height = data.readInt32(); - ALOGV("%s: CREATE_STREAM: height = %d", __FUNCTION__, height); - format = data.readInt32(); - ALOGV("%s: CREATE_STREAM: format = %d", __FUNCTION__, format); sp<IGraphicBufferProducer> bp; if (data.readInt32() != 0) { @@ -419,7 +408,7 @@ status_t BnCameraDeviceUser::onTransact( } status_t ret; - ret = createStream(width, height, format, bp); + ret = createStream(bp); reply->writeNoException(); ALOGV("%s: CREATE_STREAM: write noException", __FUNCTION__); |