Update code for count 0 of face detection

[platform/core/api/camera.git] / src / camera.c

diff --git a/src/camera.c b/src/camera.c
index 7088bf3..77f7912 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -1329,36 +1329,28 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m
                        muse_camera_msg_get(count, recv_msg);
                        muse_camera_msg_get(tbm_key, recv_msg);
 
-                       if (count > 0 && tbm_key > 0) {
+                       if (count >= 0) {
                                LOGD("FACE_DETECTION - count %d, tbm_key %d", count, tbm_key);
 
-                               if (!_camera_import_tbm_key(cb_info->bufmgr, tbm_key, &bo, &bo_handle))
-                                       break;
-
-                               /* set face info */
-                               faces = bo_handle.ptr;
-
-                               ((camera_face_detected_cb)cb_info->user_cb[event])(faces, count, cb_info->user_data[event]);
-
-#if 0
-                               {
-                                       int i = 0;
+                               if (tbm_key > 0) {
 
-                                       for (i = 0 ; i < count ; i++) {
-                                               LOGD("id[%2d] - score %d, position (%d,%d,%dx%d)",
-                                                    i, faces[i].score, faces[i].x, faces[i].y, faces[i].width, faces[i].height);
+                                       if (_camera_import_tbm_key(cb_info->bufmgr, tbm_key, &bo, &bo_handle)) {
+                                               /* set face info */
+                                               faces = bo_handle.ptr;
                                        }
                                }
-#endif
+
+                               ((camera_face_detected_cb)cb_info->user_cb[event])(faces, count, cb_info->user_data[event]);
 
                                /* release bo */
                                _camera_release_imported_bo(&bo);
 
                                /* return buffer */
-                               CAMERA_MSG_PARAM_SET(param, INT, tbm_key);
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-
-                               /*LOGD("return buffer done");*/
+                               if (tbm_key > 0) {
+                                       CAMERA_MSG_PARAM_SET(param, INT, tbm_key);
+                                       _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
+                                       /*LOGD("return buffer done");*/
+                               }
                        } else {
                                LOGE("invalid message - count %d, key %d", count, tbm_key);
                        }