Merge branch 'tizen' into tizen_line_coverage 67/178167/1
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 May 2018 04:58:50 +0000 (13:58 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 May 2018 10:57:47 +0000 (19:57 +0900)
Change-Id: Id86f07bcc3e319e4af95eb889a5695ffd8dfe2fe

1  2 
CMakeLists.txt
src/camera.c

diff --cc CMakeLists.txt
Simple merge
diff --cc src/camera.c
@@@ -1166,170 -1261,8 +1275,9 @@@ static void _camera_client_user_callbac
                break;
        case MUSE_CAMERA_EVENT_TYPE_PREVIEW:
        case MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW:
-               {
-                       int i = 0;
-                       int ret = 0;
-                       int num_buffer_key = 0;
-                       int buffer_key[BUFFER_MAX_PLANE_NUM] = {0, };
-                       int data_key = 0;
-                       unsigned char *buf_pos = NULL;
-                       tbm_bo buffer_bo[BUFFER_MAX_PLANE_NUM] = {NULL, };
-                       tbm_bo_handle buffer_bo_handle[BUFFER_MAX_PLANE_NUM] = {{.ptr = NULL}, };
-                       tbm_bo data_bo = NULL;
-                       tbm_bo_handle data_bo_handle = {.ptr = NULL};
-                       camera_preview_data_s frame;
-                       camera_stream_data_s *stream = NULL;
-                       camera_media_packet_data *mp_data = NULL;
-                       media_packet_h pkt = NULL;
- #ifdef TIZEN_FEATURE_EVAS_RENDERER
-                       media_packet_h pkt_evas = NULL;
- #endif /* TIZEN_FEATURE_EVAS_RENDERER */
-                       muse_camera_msg_get(tbm_key, recv_msg);
-                       muse_camera_msg_get(num_buffer_key, recv_msg);
-                       muse_camera_msg_get_array(buffer_key, recv_msg);
-                       muse_camera_msg_get(data_key, recv_msg);
-                       memset(&frame, 0x0, sizeof(camera_preview_data_s));
-                       if (tbm_key <= 0) {
-                               LOGE("invalid key %d", tbm_key);
-                               break;
-                       }
-                       CAMERA_MSG_PARAM_SET(param, INT, tbm_key);
-                       if (num_buffer_key < 0 || num_buffer_key > BUFFER_MAX_PLANE_NUM) {
-                               LOGE("invalid num buffer key %d", num_buffer_key);
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                               break;
-                       }
-                       if (data_key > 0) {
-                               /* import tbm data_bo and get virtual address */
-                               if (!_camera_import_tbm_key(cb_info->bufmgr, data_key, &data_bo, &data_bo_handle)) {
-                                       LOGE("failed to import data key %d", data_key);
-                                       _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                                       break;
-                               }
-                       }
-                       /* import tbm bo and get virtual address */
-                       if (!_camera_import_tbm_key(cb_info->bufmgr, tbm_key, &bo, &bo_handle)) {
-                               LOGE("failed to import key %d", tbm_key);
-                               _camera_release_imported_bo(&data_bo);
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                               break;
-                       }
-                       buf_pos = (unsigned char *)bo_handle.ptr;
-                       /* get stream info */
-                       stream = (camera_stream_data_s *)buf_pos;
-                       for (i = 0 ; i < num_buffer_key ; i++) {
-                               /* import buffer bo and get virtual address */
-                               if (!_camera_import_tbm_key(cb_info->bufmgr, buffer_key[i], &buffer_bo[i], &buffer_bo_handle[i])) {
-                                       LOGE("failed to import buffer key %d", buffer_key[i]);
-                                       /* release imported bo */
-                                       _camera_release_imported_bo(&data_bo);
-                                       _camera_release_imported_bo(&bo);
-                                       for (i -= 1 ; i >= 0 ; i--)
-                                               _camera_release_imported_bo(&buffer_bo[i]);
-                                       /* send return buffer */
-                                       _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                                       return;
-                               }
-                       }
-                       /* call preview callback */
-                       g_mutex_lock(&cb_info->preview_cb_mutex);
-                       if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW]) {
-                               _camera_preview_frame_create(stream, num_buffer_key, buffer_bo_handle, &data_bo_handle, &frame);
-                               ((camera_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW])(&frame,
-                                       cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
-                       }
-                       g_mutex_unlock(&cb_info->preview_cb_mutex);
-                       if (CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS)) {
- #ifdef TIZEN_FEATURE_EVAS_RENDERER
-                               ret = _camera_media_packet_data_create(tbm_key, num_buffer_key, bo, buffer_bo, data_bo, &mp_data);
-                               if (ret == CAMERA_ERROR_NONE) {
-                                       ret = _camera_media_packet_create(cb_info, stream, mp_data, &pkt_evas);
-                                       if (ret != CAMERA_ERROR_NONE) {
-                                               LOGE("create pkt for evas failed");
-                                               _camera_media_packet_data_release(mp_data, cb_info);
-                                               mp_data = NULL;
-                                       }
-                               }
- #else /* TIZEN_FEATURE_EVAS_RENDERER */
-                               LOGW("evas renderer is not supported");
- #endif /* TIZEN_FEATURE_EVAS_RENDERER */
-                       }
- //LCOV_EXCL_START
-                       /* call media packet callback */
-                       if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]) {
-                               ret = _camera_media_packet_data_create(tbm_key, num_buffer_key, bo, buffer_bo, data_bo, &mp_data);
-                               if (ret == CAMERA_ERROR_NONE) {
-                                       ret = _camera_media_packet_create(cb_info, stream, mp_data, &pkt);
-                                       if (ret == CAMERA_ERROR_NONE) {
-                                               ((camera_media_packet_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW])(pkt,
-                                                       cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
-                                       } else {
-                                               _camera_media_packet_data_release(mp_data, cb_info);
-                                               mp_data = NULL;
-                                       }
-                               }
-                       }
- #ifdef TIZEN_FEATURE_EVAS_RENDERER
-                       /* call evas renderer */
-                       if (pkt_evas) {
-                               g_mutex_lock(&cb_info->evas_mutex);
-                               if (cb_info->run_evas_render) {
-                                       mm_evas_renderer_write(pkt_evas, cb_info->evas_info);
-                               } else {
-                                       LOGW("evas renderer is stopped, skip this buffer...");
-                                       media_packet_destroy(pkt_evas);
-                               }
-                               pkt_evas = NULL;
-                               g_mutex_unlock(&cb_info->evas_mutex);
-                       }
- #endif /* TIZEN_FEATURE_EVAS_RENDERER */
- //LCOV_EXCL_STOP
-                       /* send message for preview callback return */
-                       if (!CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS))
-                               _camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, cb_info, NULL, 0);
-                       if (mp_data == NULL) {
-                               /* release imported bo */
-                               for (i = 0 ; i < num_buffer_key ; i++)
-                                       _camera_release_imported_bo(&buffer_bo[i]);
-                               /* unmap and unref tbm bo */
-                               _camera_release_imported_bo(&data_bo);
-                               _camera_release_imported_bo(&bo);
-                               /* return buffer */
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                               /*LOGD("return buffer Done");*/
-                       }
-               }
+               __camera_event_handler_preview(cb_info, recv_msg);
                break;
 +//LCOV_EXCL_START
        case MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS:
                {
                        int percent = 0;
                        LOGW("stop foreach callback for event %d", event);
                }
                break;
 +//LCOV_EXCL_STOP
        case MUSE_CAMERA_EVENT_TYPE_CAPTURE:
-               {
-                       camera_image_data_s *rImage = NULL;
-                       camera_image_data_s *rPostview = NULL;
-                       camera_image_data_s *rThumbnail = NULL;
-                       unsigned char *buf_pos = NULL;
-                       int tbm_key_main = 0;
-                       int tbm_key_post = 0;
-                       int tbm_key_thumb = 0;
-                       tbm_bo bo_main = NULL;
-                       tbm_bo bo_post = NULL;
-                       tbm_bo bo_thumb = NULL;
-                       tbm_bo_handle bo_main_handle = {NULL, };
-                       tbm_bo_handle bo_post_handle = {NULL, };
-                       tbm_bo_handle bo_thumb_handle = {NULL, };
-                       muse_camera_msg_get(tbm_key_main, recv_msg);
-                       muse_camera_msg_get(tbm_key_post, recv_msg);
-                       muse_camera_msg_get(tbm_key_thumb, recv_msg);
-                       /*
-                       LOGD("camera capture callback came in. tbm_key_main %d, tbm_key_post %d, tbm_key_thumb %d",
-                               tbm_key_main, tbm_key_post, tbm_key_thumb);
-                       */
-                       if (tbm_key_main <= 0) {
-                               LOGE("invalid key %d", tbm_key_main);
-                               break;
-                       }
-                       /* import tbm bo and get virtual address */
-                       if (!_camera_import_tbm_key(cb_info->bufmgr, tbm_key_main, &bo_main, &bo_main_handle))
-                               break;
-                       buf_pos = (unsigned char *)bo_main_handle.ptr;
-                       rImage = (camera_image_data_s *)buf_pos;
-                       rImage->data = buf_pos + sizeof(camera_image_data_s);
-                       if (rImage->exif && rImage->exif_size > 0) {
-                               rImage->exif = rImage->data + rImage->size;
-                       } else {
-                               rImage->exif = NULL;
-                               rImage->exif_size = 0;
-                       }
-                       LOGD("image info %dx%d, size %d, EXIF info %p, size %d",
-                               rImage->width, rImage->height, rImage->size, rImage->exif, rImage->exif_size);
-                       if (tbm_key_post > 0) {
-                               /* import tbm bo and get virtual address */
-                               if (!_camera_import_tbm_key(cb_info->bufmgr, tbm_key_post, &bo_post, &bo_post_handle))
-                                       break;
-                               buf_pos = (unsigned char *)bo_post_handle.ptr;
-                               rPostview = (camera_image_data_s *)buf_pos;
-                               LOGD("rPostview->size : %d", rPostview->size);
-                               rPostview->data = buf_pos + sizeof(camera_image_data_s);
-                       }
-                       if (tbm_key_thumb > 0) {
-                               /* import tbm bo and get virtual address */
-                               if (!_camera_import_tbm_key(cb_info->bufmgr, tbm_key_thumb, &bo_thumb, &bo_thumb_handle))
-                                       break;
-                               buf_pos = (unsigned char *)bo_thumb_handle.ptr;
-                               rThumbnail = (camera_image_data_s *)buf_pos;
-                               LOGD("rThumbnail->size : %d", rThumbnail->size);
-                               rThumbnail->data = buf_pos + sizeof(camera_image_data_s);
-                       }
-                       ((camera_capturing_cb)cb_info->user_cb[event])(rImage, rPostview, rThumbnail, cb_info->user_data[event]);
-                       /* unmap and unref tbm bo */
-                       _camera_release_imported_bo(&bo_main);
-                       /* return buffer */
-                       tbm_key = tbm_key_main;
-                       CAMERA_MSG_PARAM_SET(param, INT, tbm_key);
-                       _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                       if (tbm_key_post > 0) {
-                               /* unmap and unref tbm bo */
-                               _camera_release_imported_bo(&bo_post);
-                               /* return buffer */
-                               param.value.value_INT = tbm_key_post;
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                       }
-                       if (tbm_key_thumb > 0) {
-                               /* unmap and unref tbm bo */
-                               _camera_release_imported_bo(&bo_thumb);
-                               /* return buffer */
-                               param.value.value_INT = tbm_key_thumb;
-                               _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, &param, 0);
-                       }
-                       LOGD("return buffer done");
-               }
+               __camera_event_handler_capture(cb_info, recv_msg);
                break;
        default:
                LOGW("unhandled event %d", event);
@@@ -2392,10 -2222,9 +2241,9 @@@ static void _camera_client_callback_des
        return;
  }
  
 -
 +//LCOV_EXCL_START
  int _camera_start_evas_rendering(camera_h camera)
  {
-       int ret = CAMERA_ERROR_NONE;
        camera_cli_s *pc = (camera_cli_s *)camera;
  
        if (!pc || !pc->cb_info) {
@@@ -2456,15 -2274,9 +2293,9 @@@ int _camera_stop_evas_rendering(camera_
                ret = CAMERA_ERROR_INVALID_OPERATION;
        }
  
-       g_mutex_unlock(&pc->cb_info->evas_mutex);
- #else /* TIZEN_FEATURE_EVAS_RENDERER */
-       LOGW("evas renderer is not supported");
-       ret = CAMERA_ERROR_NOT_SUPPORTED;
- #endif /* TIZEN_FEATURE_EVAS_RENDERER */
        return ret;
  }
 -
 +//LCOV_EXCL_STOP
  
  int _camera_independent_request(int api, int device_type, const char *key, int *value)
  {
@@@ -3160,91 -2994,37 +3015,39 @@@ int camera_set_display(camera_h camera
        LOGD("Enter - display : %p", display);
  
        if (type == CAMERA_DISPLAY_TYPE_NONE) {
-               set_display_handle = 0;
                LOGD("display type NONE");
- //LCOV_EXCL_START
        } else {
-               obj = (Evas_Object *)display;
-               object_type = evas_object_type_get(obj);
-               if (object_type) {
-                       if (type == CAMERA_DISPLAY_TYPE_OVERLAY && !strcmp(object_type, "elm_win")) {
-                               /* get wayland parent id */
-                               if (_camera_get_wl_info(obj, &pc->wl_info) != CAMERA_ERROR_NONE) {
-                                       LOGE("failed to get wayland info");
-                                       return CAMERA_ERROR_INVALID_OPERATION;
-                               }
-                               set_display_handle = (void *)&pc->wl_info;
-                               LOGD("display type OVERLAY : handle %p", set_display_handle);
-                       } else if (type == CAMERA_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) {
-                               /* evas object surface */
-                               set_display_handle = (void *)display;
-                               LOGD("display type EVAS : handle %p", set_display_handle);
- #ifdef TIZEN_FEATURE_EVAS_RENDERER
-                               g_mutex_lock(&cb_info->evas_mutex);
-                               if (cb_info->evas_info) {
-                                       LOGW("destroy existed evas renderer %p", cb_info->evas_info);
-                                       ret = mm_evas_renderer_destroy(&cb_info->evas_info);
-                                       if (ret != MM_ERROR_NONE) {
-                                               LOGE("failed to destroy evas renderer %p", cb_info->evas_info);
-                                               g_mutex_unlock(&cb_info->evas_mutex);
-                                               return CAMERA_ERROR_INVALID_OPERATION;
-                                       }
-                               }
-                               /* create evas renderer */
-                               ret = mm_evas_renderer_create(&cb_info->evas_info, (Evas_Object *)set_display_handle);
-                               if (ret == MM_ERROR_NONE) {
-                                       camera_flip_e flip = CAMERA_FLIP_NONE;
-                                       camera_display_mode_e mode = CAMERA_DISPLAY_MODE_LETTER_BOX;
-                                       camera_rotation_e rotation = CAMERA_ROTATION_NONE;
-                                       bool visible = 0;
-                                       int x = 0;
-                                       int y = 0;
-                                       int width = 0;
-                                       int height = 0;
-                                       camera_get_display_flip(camera, &flip);
-                                       camera_get_display_mode(camera, &mode);
-                                       camera_get_display_rotation(camera, &rotation);
-                                       camera_is_display_visible(camera, &visible);
-                                       camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
-                                       LOGD("current setting : flip %d, mode %d, rotation %d, visible %d, roi %d,%d,%dx%d",
-                                               flip, mode, rotation, visible, x, y, width, height);
-                                       ret = mm_evas_renderer_set_flip(cb_info->evas_info, flip);
-                                       ret |= mm_evas_renderer_set_geometry(cb_info->evas_info, mode);
-                                       ret |= mm_evas_renderer_set_rotation(cb_info->evas_info, rotation);
-                                       ret |= mm_evas_renderer_set_visible(cb_info->evas_info, visible);
-                                       if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI)
-                                               ret |= mm_evas_renderer_set_roi_area(cb_info->evas_info, x, y, width, height);
-                               }
-                               g_mutex_unlock(&cb_info->evas_mutex);
-                               if (ret != MM_ERROR_NONE) {
-                                       LOGE("mm_evas_renderer error 0x%x", ret);
-                                       return CAMERA_ERROR_INVALID_OPERATION;
-                               }
- #else /* TIZEN_FEATURE_EVAS_RENDERER */
-                               LOGE("EVAS surface is not supported");
-                               return CAMERA_ERROR_NOT_SUPPORTED;
- #endif /* TIZEN_FEATURE_EVAS_RENDERER */
-                       } else {
-                               LOGE("unknown evas object [%p,%s] or type [%d] mismatch", obj, object_type, type);
-                               return CAMERA_ERROR_INVALID_PARAMETER;
-                       }
-               } else {
-                       LOGE("failed to get evas object type from %p", obj);
-                       return CAMERA_ERROR_INVALID_PARAMETER;
+               ret = mm_display_interface_set_display(cb_info->dp_interface, type, display, &cb_info->parent_id);
+               if (ret == MM_ERROR_NONE && type == CAMERA_DISPLAY_TYPE_EVAS) {
++//LCOV_EXCL_START
+                       camera_flip_e flip = CAMERA_FLIP_NONE;
+                       camera_display_mode_e mode = CAMERA_DISPLAY_MODE_LETTER_BOX;
+                       camera_rotation_e rotation = CAMERA_ROTATION_NONE;
+                       bool visible = 0;
+                       int x = 0;
+                       int y = 0;
+                       int width = 0;
+                       int height = 0;
+                       camera_get_display_flip(camera, &flip);
+                       camera_get_display_mode(camera, &mode);
+                       camera_get_display_rotation(camera, &rotation);
+                       camera_is_display_visible(camera, &visible);
+                       camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
+                       LOGD("current setting : flip %d, mode %d, rotation %d, visible %d, roi %d,%d,%dx%d",
+                               flip, mode, rotation, visible, x, y, width, height);
+                       ret = mm_display_interface_evas_set_flip(cb_info->dp_interface, flip);
+                       ret |= mm_display_interface_evas_set_mode(cb_info->dp_interface, mode);
+                       ret |= mm_display_interface_evas_set_rotation(cb_info->dp_interface, rotation);
+                       ret |= mm_display_interface_evas_set_visible(cb_info->dp_interface, visible);
+                       if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI)
+                               ret |= mm_display_interface_evas_set_roi_area(cb_info->dp_interface, x, y, width, height);
++//LCOV_EXCL_STOP
                }
        }
- //LCOV_EXCL_STOP
-       pc->display_handle = (intptr_t)set_display_handle;
  
        if (type == CAMERA_DISPLAY_TYPE_OVERLAY) {
                int send_ret = 0;