Camera: Fix the camera_test code for new ANW API

Source compatibility with JB MR0 ANW API is preserved by using the
ANDROID_API_JB_MR1_OR_LATER conditional build.

Change-Id: Ic67af4cf31a058e3cbddafb44b5c33fd8ab9d348
Signed-off-by: Daniel Levin <dendy@ti.com>

5 files changed, 47 insertions, 3 deletions

diff --git a/test/CameraHal/camera_test_bufferqueue.h b/test/CameraHal/camera_test_bufferqueue.h
index 68b9b34..c81b1ee 100644
--- a/test/CameraHal/camera_test_bufferqueue.h
+++ b/test/CameraHal/camera_test_bufferqueue.h
@@ -51,7 +51,12 @@ public:
 class BQ_BufferSourceThread : public BufferSourceThread {
 public:
     BQ_BufferSourceThread(int tex_id, sp<Camera> camera) : BufferSourceThread(camera) {
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        mBufferQueue = new BufferQueue(true);
+        mBufferQueue->setMaxAcquiredBufferCount(1);
+#else
         mBufferQueue = new BufferQueue(true, 1);
+#endif
         mFW = new FrameConsumer();
         mBufferQueue->setSynchronousMode(true);
         mBufferQueue->consumerConnect(mFW);
@@ -101,7 +106,11 @@ public:
     }
 
     virtual void onHandled(sp<GraphicBuffer> &gbuf, unsigned int slot) {
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        mBufferQueue->releaseBuffer(slot, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, Fence::NO_FENCE);
+#else
         mBufferQueue->releaseBuffer(slot, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);
+#endif
     }
 
 private:
@@ -114,7 +123,12 @@ class BQ_BufferSourceInput : public BufferSourceInput {
 public:
     BQ_BufferSourceInput(int tex_id, sp<Camera> camera) :
                   BufferSourceInput(camera), mTexId(tex_id) {
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        mBufferQueue = new BufferQueue(true);
+        mBufferQueue->setMaxAcquiredBufferCount(1);
+#else
         mBufferQueue = new BufferQueue(true, 1);
+#endif
     }
     virtual ~BQ_BufferSourceInput() {
     }
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index da8732f..06030a1 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -879,10 +879,13 @@ int createPreviewSurface(unsigned int width, unsigned int height, int32_t pixFor
         return -1;
     }
 
+#ifdef ANDROID_API_JB_MR1_OR_LATER
     surfaceControl = client->createSurface(String8("camera_test_menu"),
-                                           previewWidth,
-                                           previewHeight,
-                                           pixFormat, 0);
+            previewWidth, previewHeight, pixFormat, 0);
+#else
+    surfaceControl = client->createSurface(0,
+            previewWidth, previewHeight, pixFormat, 0);
+#endif
 
     previewSurface = surfaceControl->getSurface();
 
diff --git a/test/CameraHal/camera_test_surfacetexture.cpp b/test/CameraHal/camera_test_surfacetexture.cpp
index 4f1066a..1108caf 100644
--- a/test/CameraHal/camera_test_surfacetexture.cpp
+++ b/test/CameraHal/camera_test_surfacetexture.cpp
@@ -119,9 +119,15 @@ void GLSurface::initialize(int display) {
     if (display) {
         mComposerClient = new SurfaceComposerClient;
         ASSERT(NO_ERROR == mComposerClient->initCheck());
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        mSurfaceControl = mComposerClient->createSurface(
+                String8("Test Surface"),
+                800, 480, HAL_PIXEL_FORMAT_YCrCb_420_SP, 0);
+#else
         mSurfaceControl = mComposerClient->createSurface(
                 String8("Test Surface"), 0,
                 800, 480, HAL_PIXEL_FORMAT_YCrCb_420_SP, 0);
+#endif
 
         ASSERT(mSurfaceControl != NULL);
         ASSERT(mSurfaceControl->isValid());
@@ -483,7 +489,11 @@ void BufferSourceInput::setInput(buffer_info_t bufinfo, const char *format) {
     native_window_set_buffer_count(mWindowTapIn.get(), 1);
     native_window_set_buffers_geometry(mWindowTapIn.get(),
                   aligned_width, aligned_height, bufinfo.format);
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+    mWindowTapIn->dequeueBuffer_DEPRECATED(mWindowTapIn.get(), &anb);
+#else
     mWindowTapIn->dequeueBuffer(mWindowTapIn.get(), &anb);
+#endif
     mapper.lock(anb->handle, GRALLOC_USAGE_SW_READ_RARELY, bounds, &data);
     // copy buffer to input buffer if available
     if (bufinfo.buf.get()) {
@@ -521,7 +531,12 @@ void BufferSourceInput::setInput(buffer_info_t bufinfo, const char *format) {
     }
 
     mapper.unlock(anb->handle);
+
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+    mWindowTapIn->queueBuffer_DEPRECATED(mWindowTapIn.get(), anb);
+#else
     mWindowTapIn->queueBuffer(mWindowTapIn.get(), anb);
+#endif
 }
 
 void BufferSourceThread::showMetadata(sp<IMemory> data) {
diff --git a/test/CameraHal/surfacetexture_test.cpp b/test/CameraHal/surfacetexture_test.cpp
index b25853e..bfb232d 100644
--- a/test/CameraHal/surfacetexture_test.cpp
+++ b/test/CameraHal/surfacetexture_test.cpp
@@ -145,7 +145,11 @@ test_format (int format, int page_mode, int width, int height)
         Rect bounds(width, height);
 
         anb[i] = NULL;
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        anw->dequeueBuffer_DEPRECATED(anw.get(), &anb[i]);
+#else
         anw->dequeueBuffer(anw.get(), &anb[i]);
+#endif
         printf("%d: %p\n", i, anb[i]);
         if (anb[i] == NULL) {
             printf ("FAILED: buffer should be non-NULL\n");
diff --git a/test/VTC/IOMXDecoder.cpp b/test/VTC/IOMXDecoder.cpp
index 723bca9..cd1ab2a 100644
--- a/test/VTC/IOMXDecoder.cpp
+++ b/test/VTC/IOMXDecoder.cpp
@@ -721,7 +721,11 @@ status_t OMXDecoder::FillBufferDone(OMX_BUFFERHEADERTYPE* pBufferHdr) {
     if (mDebugFlags & FPS_DECODER) PrintDecoderFPS();
 
     ANativeWindowBuffer* buf;
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+    err = mNativeWindow->dequeueBuffer_DEPRECATED(mNativeWindow.get(), &buf);
+#else
     err = mNativeWindow->dequeueBuffer(mNativeWindow.get(), &buf);
+#endif
     if (err != 0) {
         VTC_LOGE("dequeueBuffer failed w/ error 0x%08x", err);
         return -1;
@@ -983,7 +987,11 @@ status_t OMXDecoder::allocateOutputBuffersFromNativeWindow() {
     // Dequeue buffers and send them to OMX
     for (i = 0; i < nBufferCnt; i++) {
         ANativeWindowBuffer* buf;
+#ifdef ANDROID_API_JB_MR1_OR_LATER
+        err = mNativeWindow->dequeueBuffer_DEPRECATED(mNativeWindow.get(), &buf);
+#else
         err = mNativeWindow->dequeueBuffer(mNativeWindow.get(), &buf);
+#endif
         if (err != 0) {
             VTC_LOGE("dequeueBuffer failed: %s (%d)", strerror(-err), -err);
             break;