diff options
| author | Dan Stoza <stoza@google.com> | 2014-03-18 17:55:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-18 17:55:05 +0000 |
| commit | b5ea3014b8be9eaa16da0144bd81af6fa514d8e2 (patch) | |
| tree | 32f343096a8be778e31a4e15456fbd830b0383ea /camera | |
| parent | 0fab43120972dfbf4d6f0ec19ab470131b6c8b09 (diff) | |
| parent | 8aa0f0619ea867e8fb240cf27913d4f8ae767385 (diff) | |
| download | frameworks_av-b5ea3014b8be9eaa16da0144bd81af6fa514d8e2.zip frameworks_av-b5ea3014b8be9eaa16da0144bd81af6fa514d8e2.tar.gz frameworks_av-b5ea3014b8be9eaa16da0144bd81af6fa514d8e2.tar.bz2 | |
Merge "Remove deprecated BufferQueue constructor"
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/ProCamera.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp index ba5a48c..48f8e8e 100644 --- a/camera/ProCamera.cpp +++ b/camera/ProCamera.cpp @@ -249,11 +249,14 @@ status_t ProCamera::createStreamCpu(int width, int height, int format, sp <IProCameraUser> c = mCamera; if (c == 0) return NO_INIT; - sp<BufferQueue> bq = new BufferQueue(); - sp<CpuConsumer> cc = new CpuConsumer(bq, heapCount/*, synchronousMode*/); + sp<IGraphicBufferProducer> producer; + sp<IGraphicBufferConsumer> consumer; + BufferQueue::createBufferQueue(&producer, &consumer); + sp<CpuConsumer> cc = new CpuConsumer(consumer, heapCount + /*, synchronousMode*/); cc->setName(String8("ProCamera::mCpuConsumer")); - sp<Surface> stc = new Surface(bq); + sp<Surface> stc = new Surface(producer); status_t s = createStream(width, height, format, stc->getIGraphicBufferProducer(), |