diff options
| author | Mathias Agopian <mathias@google.com> | 2013-07-16 02:18:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-16 02:18:05 +0000 |
| commit | 6a400fa3daf24fc73ad287a702890db01dfedca2 (patch) | |
| tree | 41a30e19bdc790d4c8ae2a8bf0ce2654d2c70369 | |
| parent | d542a200748d7f182e5df56aabe574d357433e46 (diff) | |
| parent | 3ce8f0277c285ce35fc885cf66c0de2c4af75af3 (diff) | |
| download | hardware_libhardware-6a400fa3daf24fc73ad287a702890db01dfedca2.zip hardware_libhardware-6a400fa3daf24fc73ad287a702890db01dfedca2.tar.gz hardware_libhardware-6a400fa3daf24fc73ad287a702890db01dfedca2.tar.bz2 | |
Merge "always pass the BufferQueue explicitely to consumers"
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index 3d614db..195e764 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -162,7 +162,8 @@ protected: sp<CameraDeviceBase> device = mDevice; CameraStreamParams p = mParam; - mCpuConsumer = new CpuConsumer(p.mHeapCount); + sp<BufferQueue> bq = new BufferQueue(); + mCpuConsumer = new CpuConsumer(bq, p.mHeapCount); mCpuConsumer->setName(String8("CameraStreamTest::mCpuConsumer")); mNativeWindow = new Surface( |