commit 20cb300bce9a2b80966a422ef2de35b18533e1dd
author Alex Ray <aray@google.com> Tue May 28 20:18:22 2013 -0700
committer Alex Ray <aray@google.com> Wed May 29 16:03:18 2013 -0700
tree 5b89eceb8d06d7d418bc3004b14224c4d45082ae
parent c3a73bb6446df8c1387a2b3ff9357190f515eccb

camera3: Error on minimum buffer count

Change-Id: Idf16de20e940e411286ec3e477534b36ef1c9b11

services/camera/libcameraservice/camera3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
index 2efeede..f085443 100644
--- a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
@@ -301,8 +301,13 @@
         return res;
     }
 
-    ALOGV("%s: Consumer wants %d buffers", __FUNCTION__,
-            maxConsumerBuffers);
+    ALOGV("%s: Consumer wants %d buffers, HAL wants %d", __FUNCTION__,
+            maxConsumerBuffers, camera3_stream::max_buffers);
+    if (camera3_stream::max_buffers == 0) {
+        ALOGE("%s: Camera HAL requested no max_buffers, requires at least 1",
+                __FUNCTION__, camera3_stream::max_buffers);
+        return INVALID_OPERATION;
+    }
 
     mTotalBufferCount = maxConsumerBuffers + camera3_stream::max_buffers;
     mDequeuedBufferCount = 0;