TDM_RETURN_VAL_IF_FAIL(pp != NULL, TDM_ERROR_INVALID_PARAMETER); \
private_pp = (tdm_private_pp*)pp; \
private_display = private_pp->private_display; \
- func_pp = private_pp->func_pp
+ func_pp = &private_display->func_pp
static void
-_tdm_pp_cb_done(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst, void *user_data)
+_tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst,
+ void *user_data)
{
- tdm_buffer_unref_backend(tdm_buffer_get(src));
- tdm_buffer_unref_backend(tdm_buffer_get(dst));
+ tdm_private_pp *private_pp = user_data;
+ tdm_private_display *private_display = private_pp->private_display;
+ int lock_after_cb_done = 0;
+ int ret;
+
+ ret = pthread_mutex_trylock(&private_display->lock);
+ if (ret == 0)
+ pthread_mutex_unlock(&private_display->lock);
+ else if (ret == EBUSY) {
+ pthread_mutex_unlock(&private_display->lock);
+ lock_after_cb_done = 1;
+ }
+
+ tdm_buffer_unref_backend(src);
+ tdm_buffer_unref_backend(dst);
+
+ if (lock_after_cb_done)
+ pthread_mutex_lock(&private_display->lock);
}
-INTERN tdm_private_pp*
+INTERN tdm_private_pp *
tdm_pp_create_internal(tdm_private_display *private_display, tdm_error *error)
{
- tdm_func_display *func_display;
- tdm_func_pp *func_pp;
- tdm_private_pp *private_pp = NULL;
- tdm_pp *pp = NULL;
- tdm_error ret = TDM_ERROR_NONE;
-
- func_display = &private_display->func_display;
- func_pp = &private_display->func_pp;
-
- if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP))
- {
- TDM_ERR("no pp capability");
- if (error)
- *error = TDM_ERROR_BAD_REQUEST;
- return NULL;
- }
-
- pp = func_display->display_create_pp(private_display->bdata, &ret);
- if (ret != TDM_ERROR_NONE)
- {
- if (error)
- *error = ret;
- return NULL;
- }
-
- private_pp = calloc(1, sizeof(tdm_private_pp));
- if (!private_pp)
- {
- TDM_ERR("failed: alloc memory");
- func_pp->pp_destroy(pp);
- if (error)
- *error = TDM_ERROR_OUT_OF_MEMORY;
- return NULL;
- }
-
- ret = func_pp->pp_set_done_handler(pp, _tdm_pp_cb_done, private_pp);
- if (ret != TDM_ERROR_NONE)
- {
- TDM_ERR("set pp_done_handler failed");
- func_pp->pp_destroy(pp);
- if (error)
- *error = ret;
- return NULL;
- }
-
- LIST_ADD(&private_pp->link, &private_display->pp_list);
- private_pp->func_pp = func_pp;
- private_pp->private_display = private_display;
- private_pp->pp = pp;
-
- if (error)
- *error = TDM_ERROR_NONE;
-
- return private_pp;
+ tdm_func_display *func_display;
+ tdm_func_pp *func_pp;
+ tdm_private_pp *private_pp = NULL;
+ tdm_pp *pp_backend = NULL;
+ tdm_error ret = TDM_ERROR_NONE;
+
+ func_display = &private_display->func_display;
+ func_pp = &private_display->func_pp;
+
+ if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)) {
+ TDM_ERR("no pp capability");
+ if (error)
+ *error = TDM_ERROR_NO_CAPABILITY;
+ return NULL;
+ }
+
+ pp_backend = func_display->display_create_pp(private_display->bdata, &ret);
+ if (ret != TDM_ERROR_NONE) {
+ if (error)
+ *error = ret;
+ return NULL;
+ }
+
+ private_pp = calloc(1, sizeof(tdm_private_pp));
+ if (!private_pp) {
+ TDM_ERR("failed: alloc memory");
+ func_pp->pp_destroy(pp_backend);
+ if (error)
+ *error = TDM_ERROR_OUT_OF_MEMORY;
+ return NULL;
+ }
+
+ ret = func_pp->pp_set_done_handler(pp_backend, _tdm_pp_cb_done, private_pp);
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("set pp_done_handler failed");
+ func_pp->pp_destroy(pp_backend);
+ if (error)
+ *error = ret;
+ return NULL;
+ }
+
+ LIST_ADD(&private_pp->link, &private_display->pp_list);
+ private_pp->private_display = private_display;
+ private_pp->pp_backend = pp_backend;
+
+ if (error)
+ *error = TDM_ERROR_NONE;
+
+ return private_pp;
}
INTERN void
tdm_pp_destroy_internal(tdm_private_pp *private_pp)
{
- tdm_func_pp *func_pp;
+ tdm_func_pp *func_pp;
- if (!private_pp)
- return;
+ if (!private_pp)
+ return;
- func_pp = private_pp->func_pp;
+ func_pp = &private_pp->private_display->func_pp;
- LIST_DEL(&private_pp->link);
+ LIST_DEL(&private_pp->link);
- func_pp->pp_destroy(private_pp->pp);
+ func_pp->pp_destroy(private_pp->pp_backend);
- free(private_pp);
+ free(private_pp);
}
EXTERN void
tdm_pp_destroy(tdm_pp *pp)
{
- tdm_private_display *private_display;
- tdm_private_pp *private_pp;
+ tdm_private_pp *private_pp = pp;
+ tdm_private_display *private_display;
- if (!pp)
- return;
+ if (!private_pp)
+ return;
- private_pp = (tdm_private_pp*)pp;
- private_display = private_pp->private_display;
+ private_display = private_pp->private_display;
- pthread_mutex_lock(&private_display->lock);
- tdm_pp_destroy_internal(private_pp);
- pthread_mutex_unlock(&private_display->lock);
-}
-
-EXTERN tdm_error
-tdm_pp_set_property(tdm_pp *pp, unsigned int id, tdm_value value)
-{
- PP_FUNC_ENTRY();
-
- pthread_mutex_lock(&private_display->lock);
-
- if (!func_pp->pp_set_property)
- {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
-
- ret = func_pp->pp_set_property(private_pp->pp, id, value);
-
- pthread_mutex_unlock(&private_display->lock);
-
- return ret;
-}
-
-EXTERN tdm_error
-tdm_pp_get_property(tdm_pp *pp, unsigned int id, tdm_value *value)
-{
- PP_FUNC_ENTRY();
-
- TDM_RETURN_VAL_IF_FAIL(value != NULL, TDM_ERROR_INVALID_PARAMETER);
-
- pthread_mutex_lock(&private_display->lock);
-
- if (!func_pp->pp_get_property)
- {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
-
- ret = func_pp->pp_get_property(private_pp->pp, id, value);
-
- pthread_mutex_unlock(&private_display->lock);
-
- return ret;
+ pthread_mutex_lock(&private_display->lock);
+ tdm_pp_destroy_internal(private_pp);
+ pthread_mutex_unlock(&private_display->lock);
}
EXTERN tdm_error
tdm_pp_set_info(tdm_pp *pp, tdm_info_pp *info)
{
- PP_FUNC_ENTRY();
+ PP_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(info != NULL, TDM_ERROR_INVALID_PARAMETER);
- TDM_RETURN_VAL_IF_FAIL(info != NULL, TDM_ERROR_INVALID_PARAMETER);
+ pthread_mutex_lock(&private_display->lock);
- pthread_mutex_lock(&private_display->lock);
+ if (!func_pp->pp_set_info) {
+ pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
- if (!func_pp->pp_set_info)
- {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
+ TDM_INFO("pp info: src(%dx%d %d,%d %dx%d %c%c%c%c) dst(%dx%d %d,%d %dx%d %c%c%c%c) trans(%d) sync(%d) flags(%x)",
+ info->src_config.size.h, info->src_config.size.v,
+ info->src_config.pos.x, info->src_config.pos.y,
+ info->src_config.pos.w, info->src_config.pos.h,
+ FOURCC_STR(info->src_config.format),
+ info->dst_config.size.h, info->dst_config.size.v,
+ info->dst_config.pos.x, info->dst_config.pos.y,
+ info->dst_config.pos.w, info->dst_config.pos.h,
+ FOURCC_STR(info->dst_config.format),
+ info->transform, info->sync, info->flags);
- ret = func_pp->pp_set_info(private_pp->pp, info);
+ ret = func_pp->pp_set_info(private_pp->pp_backend, info);
- pthread_mutex_unlock(&private_display->lock);
+ pthread_mutex_unlock(&private_display->lock);
- return ret;
+ return ret;
}
EXTERN tdm_error
-tdm_pp_attach(tdm_pp *pp, tdm_buffer *src, tdm_buffer *dst)
+tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst)
{
- PP_FUNC_ENTRY();
+ PP_FUNC_ENTRY();
- TDM_RETURN_VAL_IF_FAIL(src != NULL, TDM_ERROR_INVALID_PARAMETER);
- TDM_RETURN_VAL_IF_FAIL(dst != NULL, TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(src != NULL, TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(dst != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ pthread_mutex_lock(&private_display->lock);
- if (!func_pp->pp_attach)
- {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
+ if (!func_pp->pp_attach) {
+ pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
- tdm_buffer_ref_backend(src);
- tdm_buffer_ref_backend(dst);
- ret = func_pp->pp_attach(private_pp->pp,
- tdm_buffer_get_surface(src),
- tdm_buffer_get_surface(dst));
+ tdm_buffer_ref_backend(src);
+ tdm_buffer_ref_backend(dst);
+ ret = func_pp->pp_attach(private_pp->pp_backend, src, dst);
- pthread_mutex_unlock(&private_display->lock);
+ pthread_mutex_unlock(&private_display->lock);
- return ret;
+ return ret;
}
EXTERN tdm_error
tdm_pp_commit(tdm_pp *pp)
{
- PP_FUNC_ENTRY();
+ PP_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ pthread_mutex_lock(&private_display->lock);
- if (!func_pp->pp_commit)
- {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
+ if (!func_pp->pp_commit) {
+ pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
- ret = func_pp->pp_commit(private_pp->pp);
+ ret = func_pp->pp_commit(private_pp->pp_backend);
- pthread_mutex_unlock(&private_display->lock);
+ pthread_mutex_unlock(&private_display->lock);
- return ret;
+ return ret;
}
projects / platform / core / uifw / libtdm.git / blobdiff