diff options
| author | Mathias Agopian <mathias@google.com> | 2013-07-16 02:17:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-16 02:17:39 +0000 |
| commit | 5478f3c44b9d6670261733953a71a8290fa70ae8 (patch) | |
| tree | 4060b3eb8796d477e55e418a69629586a75e17eb /camera | |
| parent | 099b457f3203fa51387e21bd450495abb973ab31 (diff) | |
| parent | 8d764bfc74c40641f018a0aa87d6f484aec92eae (diff) | |
| download | frameworks_av-5478f3c44b9d6670261733953a71a8290fa70ae8.zip frameworks_av-5478f3c44b9d6670261733953a71a8290fa70ae8.tar.gz frameworks_av-5478f3c44b9d6670261733953a71a8290fa70ae8.tar.bz2 | |
Merge "always pass the BufferQueue explicitely to consumers"
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/ProCamera.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp index fec5461..190402e 100644 --- a/camera/ProCamera.cpp +++ b/camera/ProCamera.cpp @@ -247,7 +247,8 @@ status_t ProCamera::createStreamCpu(int width, int height, int format, sp <IProCameraUser> c = mCamera; if (c == 0) return NO_INIT; - sp<CpuConsumer> cc = new CpuConsumer(heapCount, synchronousMode); + sp<BufferQueue> bq = new BufferQueue(); + sp<CpuConsumer> cc = new CpuConsumer(bq, heapCount, synchronousMode); cc->setName(String8("ProCamera::mCpuConsumer")); sp<Surface> stc = new Surface( |