diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-08-17 17:28:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 17:28:11 +0000 |
commit | 5d1103e5a229401a4c4e0cb7dd91b2742881ff92 (patch) | |
tree | ac815f1a2ee6af6deb53754a149d31a6b3eac34a /camera | |
parent | 5f7d4b957a4b41eaee3bcfbe8cb5a2f8f3dc8dc0 (diff) | |
parent | c78ac26e3a65328fc0118f16ee76a800d0687eb7 (diff) | |
download | frameworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.zip frameworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.tar.gz frameworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.tar.bz2 |
Merge "Add experimental camera session prepare API." into mnc-dr-dev
Diffstat (limited to 'camera')
-rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index d2dc200..2a9fd2b 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -49,7 +49,8 @@ enum { WAIT_UNTIL_IDLE, FLUSH, PREPARE, - TEAR_DOWN + TEAR_DOWN, + PREPARE2 }; namespace { @@ -366,6 +367,21 @@ public: return reply.readInt32(); } + virtual status_t prepare2(int maxCount, int streamId) + { + ALOGV("prepare2"); + Parcel data, reply; + + data.writeInterfaceToken(ICameraDeviceUser::getInterfaceDescriptor()); + data.writeInt32(maxCount); + data.writeInt32(streamId); + + remote()->transact(PREPARE2, data, &reply); + + reply.readExceptionCode(); + return reply.readInt32(); + } + virtual status_t tearDown(int streamId) { ALOGV("tearDown"); @@ -592,7 +608,14 @@ status_t BnCameraDeviceUser::onTransact( reply->writeInt32(tearDown(streamId)); return NO_ERROR; } break; - + case PREPARE2: { + CHECK_INTERFACE(ICameraDeviceUser, data, reply); + int maxCount = data.readInt32(); + int streamId = data.readInt32(); + reply->writeNoException(); + reply->writeInt32(prepare2(maxCount, streamId)); + return NO_ERROR; + } break; default: return BBinder::onTransact(code, data, reply, flags); } |