summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-07-12 22:06:56 -0700
committerMathias Agopian <mathias@google.com>2013-07-12 22:06:56 -0700
commit709ed76788930c34958b8f8ba754f6bbcef4834c (patch)
treea0ae4d0775ebe6bc1f8817cb152abab659f126c3
parent7fdf15422c3d318ff82cf5373fb54455f9882992 (diff)
downloadomap4-aah-709ed76788930c34958b8f8ba754f6bbcef4834c.tar.gz
always pass the BufferQueue explicitely to consumers
Change-Id: Ieef876f56bb7d503696e59f406108700459f1a69
-rw-r--r--test/CameraHal/camera_test_surfacetexture.cpp3
-rw-r--r--test/CameraHal/surfacetexture_test.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/test/CameraHal/camera_test_surfacetexture.cpp b/test/CameraHal/camera_test_surfacetexture.cpp
index 285cc51..88d843e 100644
--- a/test/CameraHal/camera_test_surfacetexture.cpp
+++ b/test/CameraHal/camera_test_surfacetexture.cpp
@@ -501,7 +501,8 @@ sp<GLConsumer> SurfaceTextureBase::getST() {
void SurfaceTextureBase::initialize(int tex_id, EGLenum tex_target) {
mTexId = tex_id;
- mST = new GLConsumer(tex_id, true, tex_target);
+ sp<BufferQueue> bq = new BufferQueue();
+ mST = new GLConsumer(bq, tex_id, tex_target);
mSTC = new Surface(mST);
mANW = mSTC;
}
diff --git a/test/CameraHal/surfacetexture_test.cpp b/test/CameraHal/surfacetexture_test.cpp
index 2a96eea..c9cf356 100644
--- a/test/CameraHal/surfacetexture_test.cpp
+++ b/test/CameraHal/surfacetexture_test.cpp
@@ -122,7 +122,8 @@ test_format (int format, int page_mode, int width, int height)
printf("testing format %x, page_mode %d\n", format, page_mode);
- st = new GLConsumer (tex_id, true, GL_TEXTURE_EXTERNAL_OES);
+ sp<BufferQueue> bq = new BufferQueue();
+ st = new GLConsumer (bq, tex_id, GL_TEXTURE_EXTERNAL_OES);
st->setDefaultBufferSize (width, height);