diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-16 11:00:37 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2015-07-06 17:49:44 -0700 |
commit | 3450ba7879be6522ea46a56c5e66e5382f5dd5ba (patch) | |
tree | 201ed5e416af4f44012e6b5c7f2b16bd30cfc673 /camera/camera2 | |
parent | a3b3caaae3fc23b99c5c455ee429f79c270cfbae (diff) | |
download | frameworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.zip frameworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.tar.gz frameworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.tar.bz2 |
camera2: Fix native binder interface and add tests.
- Add CameraBinderTests for limited coverage of native
camera2 binder interfaces for the camera service.
- Fix several bugs in the native binder interfaces.
Bug: 18468810
Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c
Diffstat (limited to 'camera/camera2')
-rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 8 | ||||
-rw-r--r-- | camera/camera2/OutputConfiguration.cpp | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index a7549f2..ffe974b 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -82,7 +82,7 @@ public: reply.readExceptionCode(); } - virtual status_t submitRequest(sp<CaptureRequest> request, bool repeating, + virtual int submitRequest(sp<CaptureRequest> request, bool repeating, int64_t *lastFrameNumber) { Parcel data, reply; @@ -111,13 +111,13 @@ public: } } - if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) { + if (res < 0 || (resFrameNumber != NO_ERROR)) { res = FAILED_TRANSACTION; } return res; } - virtual status_t submitRequestList(List<sp<CaptureRequest> > requestList, bool repeating, + virtual int submitRequestList(List<sp<CaptureRequest> > requestList, bool repeating, int64_t *lastFrameNumber) { Parcel data, reply; @@ -151,7 +151,7 @@ public: resFrameNumber = reply.readInt64(lastFrameNumber); } } - if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) { + if (res < 0 || (resFrameNumber != NO_ERROR)) { res = FAILED_TRANSACTION; } return res; diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp index 24acaa0..20a23e0 100644 --- a/camera/camera2/OutputConfiguration.cpp +++ b/camera/camera2/OutputConfiguration.cpp @@ -65,6 +65,11 @@ OutputConfiguration::OutputConfiguration(const Parcel& parcel) { gbp.get(), String8(name).string()); } +OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation) { + mGbp = gbp; + mRotation = rotation; +} + status_t OutputConfiguration::writeToParcel(Parcel& parcel) const { parcel.writeInt32(mRotation); |