commit 8a8f86bbe6cd0d62c81b7f0f7414b74e1aa20f37
author Alex Ray <aray@google.com> Fri Mar 01 01:32:21 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 13 19:47:47 2013 +0000
tree c69bd9ff7e408591f8307ee55720ee48e74c3e8d
parent e0bd66511a68933eef3347d5e581e043d7eddcb8

modules: camera: Add buffer registration scaffold

Change-Id: Ic1d20dd7f93a0ca3cd2c3af3b33a7a9df47b5e89

modules/camera/Camera.cpp

diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp
index b06f65d..21ac232 100644
--- a/modules/camera/Camera.cpp
+++ b/modules/camera/Camera.cpp
@@ -262,8 +262,16 @@
 int Camera::registerStreamBuffers(const camera3_stream_buffer_set_t *buf_set)
 {
     ALOGV("%s:%d: buffer_set=%p", __func__, mId, buf_set);
-    // TODO: register buffers with hardware
-    return 0;
+    if (buf_set == NULL) {
+        ALOGE("%s:%d: NULL buffer set", __func__, mId);
+        return -EINVAL;
+    }
+    if (buf_set->stream == NULL) {
+        ALOGE("%s:%d: NULL stream handle", __func__, mId);
+        return -EINVAL;
+    }
+    Stream *stream = reinterpret_cast<Stream*>(buf_set->stream->priv);
+    return stream->registerBuffers(buf_set);
 }
 
 const camera_metadata_t* Camera::constructDefaultRequestSettings(int type)