Merge "improvements to the batch mode APIs"
diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h
index 195e764..6b31544 100644
--- a/tests/camera2/CameraStreamFixture.h
+++ b/tests/camera2/CameraStreamFixture.h
@@ -166,8 +166,7 @@
mCpuConsumer = new CpuConsumer(bq, p.mHeapCount);
mCpuConsumer->setName(String8("CameraStreamTest::mCpuConsumer"));
- mNativeWindow = new Surface(
- mCpuConsumer->getProducerInterface());
+ mNativeWindow = new Surface(bq);
int format = MapAutoFormat(p.mFormat);
diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 87f51f0..17e4792 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -418,8 +418,7 @@
int streamId;
ASSERT_NO_FATAL_FAILURE(
- setUpStream(rawConsumer->getProducerInterface(),
- width, height, format, &streamId) );
+ setUpStream(bq, width, height, format, &streamId) );
camera_metadata_t *request;
request = allocate_camera_metadata(20, 2000);
@@ -553,8 +552,7 @@
int streamId;
ASSERT_NO_FATAL_FAILURE(
- setUpStream(rawConsumer->getProducerInterface(),
- width, height, format, &streamId) );
+ setUpStream(bq, width, height, format, &streamId) );
camera_metadata_t *request;
request = allocate_camera_metadata(20, 2000);
@@ -723,8 +721,7 @@
int streamId;
ASSERT_NO_FATAL_FAILURE(
- setUpStream(jpegConsumer->getProducerInterface(),
- width, height, format, &streamId) );
+ setUpStream(bq, width, height, format, &streamId) );
camera_metadata_t *request;
request = allocate_camera_metadata(20, 2000);