X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_capture.c;h=1fd5bb48f30bba0e1d7b325d2415d19399be752e;hb=refs%2Fheads%2Ftizen_5.0;hp=f0b4be681c2c72bec3d0e823c4f2d6a2f50034b4;hpb=6c6338dd5b9527db34621319b61d567bad57c226;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/src/tdm_capture.c b/src/tdm_capture.c index f0b4be6..1fd5bb4 100644 --- a/src/tdm_capture.c +++ b/src/tdm_capture.c @@ -9,7 +9,7 @@ * Taeheon Kim , * YoungJun Cho , * SooChan Lim , - * Boram Park + * Boram Park * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -37,20 +37,19 @@ #include "config.h" #endif -#include "tdm.h" -#include "tdm_backend.h" #include "tdm_private.h" -#include "tdm_helper.h" #define CAPTURE_FUNC_ENTRY() \ tdm_func_capture *func_capture; \ tdm_private_display *private_display; \ + tdm_private_module *private_module; \ tdm_private_capture *private_capture; \ tdm_error ret = TDM_ERROR_NONE; \ TDM_RETURN_VAL_IF_FAIL(capture != NULL, TDM_ERROR_INVALID_PARAMETER); \ private_capture = (tdm_private_capture*)capture; \ private_display = private_capture->private_display; \ - func_capture = &private_display->func_capture + private_module = private_capture->private_module; \ + func_capture = &private_module->func_capture static void _tdm_capture_print_list(struct list_head *list) @@ -61,10 +60,13 @@ _tdm_capture_print_list(struct list_head *list) TDM_RETURN_IF_FAIL(list != NULL); + str[0] = '\0'; p = str; LIST_FOR_EACH_ENTRY(b, list, link) { if (len > 0) { - int l = snprintf(p, len, " (%p)", b->buffer); + tbm_bo bo = tbm_surface_internal_get_bo(b->buffer, 0); + int flags = tbm_bo_get_flags(bo); + int l = snprintf(p, len, " (%p[bo_flags:%x])", b->buffer, flags); p += l; len -= l; } else @@ -100,34 +102,19 @@ _tdm_capture_find_buffer(struct list_head *list, tdm_capture_private_buffer *cap return NULL; } -INTERN void -tdm_capture_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer, - void *user_data) +static void +_tdm_capture_thread_cb_done(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data) { - tdm_private_capture *private_capture = user_data; - tdm_private_display *private_display = private_capture->private_display; + tdm_thread_cb_capture_done *capture_done = (tdm_thread_cb_capture_done *)cb_base; + tdm_private_capture *private_capture = object; tdm_capture_private_buffer *capture_buffer = NULL, *first_entry = NULL; + tbm_surface_h buffer; TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED()); - if (private_capture->owner_tid != syscall(SYS_gettid)) { - tdm_thread_cb_capture_done capture_done; - tdm_error ret; - - capture_done.base.type = TDM_THREAD_CB_CAPTURE_DONE; - capture_done.base.length = sizeof capture_done; - capture_done.capture_stamp = private_capture->stamp; - capture_done.buffer = buffer; - capture_done.user_data = user_data; - - ret = tdm_thread_send_cb(private_display->private_loop, &capture_done.base); - TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + assert(private_capture->owner_tid == syscall(SYS_gettid)); - return; - } - - if (private_capture->owner_tid != syscall(SYS_gettid)) - TDM_NEVER_GET_HERE(); + buffer = capture_done->buffer; if (tdm_debug_dump & TDM_DUMP_FLAG_CAPTURE) { /* LCOV_EXCL_START */ @@ -143,15 +130,13 @@ tdm_capture_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer, if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) { tbm_bo bo = tbm_surface_internal_get_bo(buffer, 0); - TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); + TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); } if (!LIST_IS_EMPTY(&private_capture->buffer_list)) { first_entry = container_of((&private_capture->buffer_list)->next, capture_buffer, link); if (first_entry->buffer != buffer) TDM_ERR("buffer(%p) is skipped", first_entry->buffer); - } else { - TDM_NEVER_GET_HERE(); } if ((capture_buffer = _tdm_capture_find_tbm_buffer(&private_capture->buffer_list, buffer))) { @@ -168,53 +153,86 @@ tdm_capture_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer, } } -INTERN tdm_private_capture * -tdm_capture_find_stamp(tdm_private_display *private_display, double stamp) +static void +_tdm_capture_cb_done(tdm_capture *capture_module, tbm_surface_h buffer, void *user_data) { + tdm_private_capture *private_capture = user_data; + tdm_thread_cb_capture_done capture_done; + tdm_error ret; + + TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED()); + + memset(&capture_done, 0, sizeof capture_done); + capture_done.base.type = TDM_THREAD_CB_CAPTURE_DONE; + capture_done.base.length = sizeof capture_done; + capture_done.base.object_stamp = private_capture->stamp; + capture_done.base.data = NULL; + capture_done.base.sync = 0; + capture_done.buffer = buffer; + + ret = tdm_thread_cb_call(private_capture, &capture_done.base, 1); + TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); +} + +static void * +_tdm_capture_find_object(tdm_private_display *private_display, double stamp) +{ + tdm_private_module *private_module = NULL; tdm_private_capture *private_capture = NULL; TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL); - LIST_FOR_EACH_ENTRY(private_capture, &private_display->capture_list, display_link) { - if (private_capture->stamp == stamp) - return private_capture; + LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) { + LIST_FOR_EACH_ENTRY(private_capture, &private_module->capture_list, display_link) { + if (private_capture->stamp == stamp) + return private_capture; + } } return NULL; } +INTERN tdm_error +tdm_capture_init(tdm_private_display *private_display) +{ + tdm_thread_cb_set_find_func(TDM_THREAD_CB_CAPTURE_DONE, _tdm_capture_find_object); + + return TDM_ERROR_NONE; +} + INTERN tdm_private_capture * tdm_capture_create_output_internal(tdm_private_output *private_output, tdm_error *error) { tdm_private_display *private_display = private_output->private_display; - tdm_func_output *func_output = &private_display->func_output; - tdm_func_capture *func_capture = &private_display->func_capture; + tdm_private_module *private_module = private_output->private_module; + tdm_func_output *func_output = &private_module->func_output; + tdm_func_capture *func_capture = &private_module->func_capture; tdm_private_capture *private_capture = NULL; - tdm_capture *capture_backend = NULL; + tdm_capture *capture_module = NULL; tdm_error ret = TDM_ERROR_NONE; TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL); - if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) { + if (!(private_module->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) { /* LCOV_EXCL_START */ - TDM_ERR("no capture capability"); + TDM_ERR("backend(%s) no capture capability", private_module->module_data->name); if (error) *error = TDM_ERROR_NO_CAPABILITY; return NULL; /* LCOV_EXCL_STOP */ } - if (!(private_display->caps_capture.capabilities & TDM_CAPTURE_CAPABILITY_OUTPUT)) { + if (!(private_module->caps_capture.capabilities & TDM_CAPTURE_CAPABILITY_OUTPUT)) { /* LCOV_EXCL_START */ - TDM_ERR("no output capture capability"); + TDM_ERR("backend(%s) no output capture capability", private_module->module_data->name); if (error) *error = TDM_ERROR_NO_CAPABILITY; return NULL; /* LCOV_EXCL_STOP */ } - capture_backend = func_output->output_create_capture( + capture_module = func_output->output_create_capture( private_output->output_backend, &ret); if (ret != TDM_ERROR_NONE) { /* LCOV_EXCL_START */ @@ -228,19 +246,29 @@ tdm_capture_create_output_internal(tdm_private_output *private_output, if (!private_capture) { /* LCOV_EXCL_START */ TDM_ERR("failed: alloc memory"); - func_capture->capture_destroy(capture_backend); + func_capture->capture_destroy(capture_module); if (error) *error = TDM_ERROR_OUT_OF_MEMORY; return NULL; /* LCOV_EXCL_STOP */ } - ret = func_capture->capture_set_done_handler(capture_backend, - tdm_capture_cb_done, private_capture); + ret = tdm_thread_cb_add(private_capture, TDM_THREAD_CB_CAPTURE_DONE, NULL, _tdm_capture_thread_cb_done, NULL); + if (ret != TDM_ERROR_NONE) { + TDM_ERR("capture tdm_thread_cb_add failed"); + func_capture->capture_destroy(capture_module); + free(private_capture); + if (error) + *error = ret; + return NULL; + } + + ret = func_capture->capture_set_done_handler(capture_module, _tdm_capture_cb_done, private_capture); if (ret != TDM_ERROR_NONE) { /* LCOV_EXCL_START */ TDM_ERR("capture(%p) set capture_done_handler failed", private_capture); - func_capture->capture_destroy(capture_backend); + func_capture->capture_destroy(capture_module); + free(private_capture); if (error) *error = ret; return NULL; @@ -248,17 +276,19 @@ tdm_capture_create_output_internal(tdm_private_output *private_output, } private_capture->stamp = tdm_helper_get_time(); - while (tdm_capture_find_stamp(private_display, private_capture->stamp)) + while (_tdm_capture_find_object(private_display, private_capture->stamp)) private_capture->stamp++; LIST_ADD(&private_capture->link, &private_output->capture_list); - LIST_ADD(&private_capture->display_link, &private_display->capture_list); + LIST_ADD(&private_capture->display_link, &private_module->capture_list); + + private_capture->private_module = private_module; private_capture->target = TDM_CAPTURE_TARGET_OUTPUT; private_capture->private_display = private_display; private_capture->private_output = private_output; private_capture->private_layer = NULL; - private_capture->capture_backend = capture_backend; + private_capture->capture_module = capture_module; private_capture->owner_tid = syscall(SYS_gettid); LIST_INITHEAD(&private_capture->pending_buffer_list); @@ -278,30 +308,31 @@ tdm_capture_create_layer_internal(tdm_private_layer *private_layer, tdm_error *error) { tdm_private_output *private_output = private_layer->private_output; + tdm_private_module *private_module = private_layer->private_module; tdm_private_display *private_display = private_output->private_display; - tdm_func_layer *func_layer = &private_display->func_layer; - tdm_func_capture *func_capture = &private_display->func_capture; + tdm_func_layer *func_layer = &private_module->func_layer; + tdm_func_capture *func_capture = &private_module->func_capture; tdm_private_capture *private_capture = NULL; - tdm_capture *capture_backend = NULL; + tdm_capture *capture_module = NULL; tdm_error ret = TDM_ERROR_NONE; TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL); - if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) { - TDM_ERR("no capture capability"); + if (!(private_module->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) { + TDM_ERR("backend(%s) no capture capability", private_module->module_data->name); if (error) *error = TDM_ERROR_NO_CAPABILITY; return NULL; } - if (!(private_display->caps_capture.capabilities & TDM_CAPTURE_CAPABILITY_LAYER)) { - TDM_ERR("no layer capture capability"); + if (!(private_module->caps_capture.capabilities & TDM_CAPTURE_CAPABILITY_LAYER)) { + TDM_ERR("backend(%s) no layer capture capability", private_module->module_data->name); if (error) *error = TDM_ERROR_NO_CAPABILITY; return NULL; } - capture_backend = func_layer->layer_create_capture(private_layer->layer_backend, + capture_module = func_layer->layer_create_capture(private_layer->layer_backend, &ret); if (ret != TDM_ERROR_NONE) return NULL; @@ -309,24 +340,26 @@ tdm_capture_create_layer_internal(tdm_private_layer *private_layer, private_capture = calloc(1, sizeof(tdm_private_capture)); if (!private_capture) { TDM_ERR("failed: alloc memory"); - func_capture->capture_destroy(capture_backend); + func_capture->capture_destroy(capture_module); if (error) *error = TDM_ERROR_OUT_OF_MEMORY; return NULL; } private_capture->stamp = tdm_helper_get_time(); - while (tdm_capture_find_stamp(private_display, private_capture->stamp)) + while (_tdm_capture_find_object(private_display, private_capture->stamp)) private_capture->stamp++; LIST_ADD(&private_capture->link, &private_layer->capture_list); - LIST_ADD(&private_capture->display_link, &private_display->capture_list); + LIST_ADD(&private_capture->display_link, &private_module->capture_list); + + private_capture->private_module = private_module; private_capture->target = TDM_CAPTURE_TARGET_LAYER; private_capture->private_display = private_display; private_capture->private_output = private_output; private_capture->private_layer = private_layer; - private_capture->capture_backend = capture_backend; + private_capture->capture_module = capture_module; private_capture->owner_tid = syscall(SYS_gettid); LIST_INITHEAD(&private_capture->pending_buffer_list); @@ -345,6 +378,7 @@ INTERN void tdm_capture_destroy_internal(tdm_private_capture *private_capture) { tdm_private_display *private_display; + tdm_private_module *private_module; tdm_func_capture *func_capture; tdm_capture_private_buffer *b = NULL, *bb = NULL; struct list_head clone_list; @@ -356,11 +390,14 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture) private_display = private_capture->private_display; + tdm_thread_cb_remove(private_capture, TDM_THREAD_CB_CAPTURE_DONE, NULL, _tdm_capture_thread_cb_done, NULL); + LIST_DEL(&private_capture->link); LIST_DEL(&private_capture->display_link); - func_capture = &private_capture->private_display->func_capture; - func_capture->capture_destroy(private_capture->capture_backend); + private_module = private_capture->private_module; + func_capture = &private_module->func_capture; + func_capture->capture_destroy(private_capture->capture_module); if (!LIST_IS_EMPTY(&private_capture->pending_buffer_list)) { TDM_WRN("capture(%p) not finished:", private_capture); @@ -378,7 +415,7 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture) if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) { tbm_bo bo = tbm_surface_internal_get_bo(b->buffer, 0); - TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); + TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); } tdm_buffer_unref_backend(b->buffer); @@ -403,7 +440,7 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture) if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) { tbm_bo bo = tbm_surface_internal_get_bo(b->buffer, 0); - TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); + TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo)); } tdm_buffer_unref_backend(b->buffer); @@ -457,7 +494,7 @@ tdm_capture_set_info(tdm_capture *capture, tdm_info_capture *info) info->frequency = private_output->current_mode->vrefresh; } - TDM_INFO("capture(%p) info: dst(%dx%d %d,%d %dx%d %c%c%c%c) trans(%d) type(%d) freq(%d) flags(%x)", + TDM_INFO("capture(%p) info: dst(%ux%u %u,%u %ux%u %c%c%c%c) trans(%d) type(%d) freq(%d) flags(%x)", private_capture, info->dst_config.size.h, info->dst_config.size.v, info->dst_config.pos.x, info->dst_config.pos.y, @@ -465,7 +502,7 @@ tdm_capture_set_info(tdm_capture *capture, tdm_info_capture *info) FOURCC_STR(info->dst_config.format), info->transform, info->type, info->frequency, info->flags); - ret = func_capture->capture_set_info(private_capture->capture_backend, info); + ret = func_capture->capture_set_info(private_capture->capture_module, info); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); private_capture->info = *info; @@ -518,15 +555,15 @@ tdm_capture_attach(tdm_capture *capture, tbm_surface_h buffer) /* LCOV_EXCL_STOP */ } - if (tdm_display_check_module_abi(private_display, 1, 2) && - private_display->caps_capture.max_attach_count > 0) { + if (tdm_module_check_abi(private_module, 1, 2) && + private_module->caps_capture.max_attach_count > 0) { /* LCOV_EXCL_START */ int length = LIST_LENGTH(&private_capture->pending_buffer_list) + LIST_LENGTH(&private_capture->buffer_list); - if (length >= private_display->caps_capture.max_attach_count) { + if (length >= private_module->caps_capture.max_attach_count) { _pthread_mutex_unlock(&private_display->lock); - TDM_DBG("failed: too many attached!! max_attach_count(%d)", - private_display->caps_capture.max_attach_count); + TDM_DBG("failed: backend(%s) too many attached!! max_attach_count(%d)", + private_module->module_data->name, private_module->caps_capture.max_attach_count); return TDM_ERROR_BAD_REQUEST; } /* LCOV_EXCL_STOP */ @@ -541,7 +578,7 @@ tdm_capture_attach(tdm_capture *capture, tbm_surface_h buffer) /* LCOV_EXCL_STOP */ } - ret = func_capture->capture_attach(private_capture->capture_backend, buffer); + ret = func_capture->capture_attach(private_capture->capture_module, buffer); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); if (ret != TDM_ERROR_NONE) { @@ -558,12 +595,13 @@ tdm_capture_attach(tdm_capture *capture, tbm_surface_h buffer) if (tdm_debug_module & TDM_DEBUG_BUFFER) { TDM_INFO("capture(%p) attached:", private_capture); - tdm_buffer_list_dump(&private_capture->buffer_list); + _tdm_capture_print_list(&private_capture->pending_buffer_list); + _tdm_capture_print_list(&private_capture->buffer_list); } if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) { tbm_bo bo = tbm_surface_internal_get_bo(buffer, 0); - TDM_TRACE_ASYNC_BEGIN((int)capture, "[CAPTURE] %d", tbm_bo_export(bo)); + TDM_TRACE_ASYNC_BEGIN((intptr_t)capture, "[CAPTURE] %d", tbm_bo_export(bo)); } _pthread_mutex_unlock(&private_display->lock); @@ -608,7 +646,13 @@ tdm_capture_commit(tdm_capture *capture) LIST_ADDTAIL(&b->commit_link, &commit_buffer_list); } - ret = func_capture->capture_commit(private_capture->capture_backend); + if (tdm_debug_module & TDM_DEBUG_BUFFER) { + TDM_INFO("capture(%p) committed:", private_capture); + _tdm_capture_print_list(&private_capture->pending_buffer_list); + _tdm_capture_print_list(&private_capture->buffer_list); + } + + ret = func_capture->capture_commit(private_capture->capture_module); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); LIST_FOR_EACH_ENTRY_SAFE(b, bb, &commit_buffer_list, commit_link) { @@ -619,12 +663,6 @@ tdm_capture_commit(tdm_capture *capture) if (ret != TDM_ERROR_NONE) { /* LCOV_EXCL_START */ - /* Not to call the user release handler when failed. - * Do we have to call this function here really? - * User better use set_done_handler to know when pp is done. Using - * buffer_release_handler is not good. - */ - tdm_buffer_remove_release_handler_internal(b->buffer); _pthread_mutex_unlock(&private_display->lock); tdm_buffer_unref_backend(b->buffer);