always pass the BufferQueue explicitely to consumers

to fix tests build.

Change-Id: Ifec605926324683ac9b12b8ed3cbfb6ac02ec18c

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 92ef221..87f51f0 100644 (file)
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -386,7 +386,8 @@ TEST_F(Camera2Test, Capture1Raw) {
 
         ASSERT_NO_FATAL_FAILURE(setUpCamera(id));
 
-        sp<CpuConsumer> rawConsumer = new CpuConsumer(1);
+        sp<BufferQueue> bq = new BufferQueue();
+        sp<CpuConsumer> rawConsumer = new CpuConsumer(bq, 1);
         sp<FrameWaiter> rawWaiter = new FrameWaiter();
         rawConsumer->setFrameAvailableListener(rawWaiter);
 
@@ -520,7 +521,8 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
 
         ASSERT_NO_FATAL_FAILURE(setUpCamera(id));
 
-        sp<CpuConsumer> rawConsumer = new CpuConsumer(1);
+        sp<BufferQueue> bq = new BufferQueue();
+        sp<CpuConsumer> rawConsumer = new CpuConsumer(bq, 1);
         sp<FrameWaiter> rawWaiter = new FrameWaiter();
         rawConsumer->setFrameAvailableListener(rawWaiter);
 
@@ -701,7 +703,8 @@ TEST_F(Camera2Test, Capture1Jpeg) {
 
         ASSERT_NO_FATAL_FAILURE(setUpCamera(id));
 
-        sp<CpuConsumer> jpegConsumer = new CpuConsumer(1);
+        sp<BufferQueue> bq = new BufferQueue();
+        sp<CpuConsumer> jpegConsumer = new CpuConsumer(bq, 1);
         sp<FrameWaiter> jpegWaiter = new FrameWaiter();
         jpegConsumer->setFrameAvailableListener(jpegWaiter);