diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-07-07 19:31:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 19:31:53 +0000 |
commit | 878b8f1a0128cf63617782e3073dffb212d0c8f1 (patch) | |
tree | 71045bbd8b8ebed4b5139ce6e4ef5bd490823b1b /include | |
parent | 637709460ea75e927a5802899d6547bca3b5e7be (diff) | |
parent | 3450ba7879be6522ea46a56c5e66e5382f5dd5ba (diff) | |
download | frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.zip frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.tar.gz frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.tar.bz2 |
Merge "camera2: Fix native binder interface and add tests." into mnc-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/camera2/OutputConfiguration.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/camera/camera2/OutputConfiguration.h b/include/camera/camera2/OutputConfiguration.h index e6b679f..5bcbe15 100644 --- a/include/camera/camera2/OutputConfiguration.h +++ b/include/camera/camera2/OutputConfiguration.h @@ -39,6 +39,8 @@ public: // getRotation will be INVALID_ROTATION if error occurred OutputConfiguration(const Parcel& parcel); + OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation); + private: sp<IGraphicBufferProducer> mGbp; int mRotation; |