#include "tdm.h"
#include "tdm_backend.h"
#include "tdm_private.h"
+#include "tdm_helper.h"
#define COUNT_MAX 10
private_output = private_layer->private_output; \
private_display = private_output->private_display
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+struct type_name {
+ int type;
+ const char *name;
+};
+
+#define type_name_fn(res) \
+const char * res##_str(int type) { \
+ unsigned int i; \
+ for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
+ if (res##_names[i].type == type) \
+ return res##_names[i].name; \
+ } \
+ return "(invalid)"; \
+}
+
+struct type_name dpms_names[] = {
+ { TDM_OUTPUT_DPMS_ON, "on" },
+ { TDM_OUTPUT_DPMS_STANDBY, "standby" },
+ { TDM_OUTPUT_DPMS_SUSPEND, "suspend" },
+ { TDM_OUTPUT_DPMS_OFF, "off" },
+};
+
+INTERN type_name_fn(dpms)
+
+struct type_name status_names[] = {
+ { TDM_OUTPUT_CONN_STATUS_DISCONNECTED, "disconnected" },
+ { TDM_OUTPUT_CONN_STATUS_CONNECTED, "connected" },
+ { TDM_OUTPUT_CONN_STATUS_MODE_SETTED, "mode_setted" },
+};
+
+INTERN type_name_fn(status)
+
EXTERN tdm_error
tdm_display_get_capabilities(tdm_display *dpy,
tdm_display_capability *capabilities)
TDM_RETURN_VAL_IF_FAIL(capabilities != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*capabilities = private_display->capabilities;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(capabilities != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)) {
TDM_ERR("no pp capability");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NO_CAPABILITY;
}
*capabilities = private_display->caps_pp.capabilities;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(formats != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)) {
TDM_ERR("no pp capability");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NO_CAPABILITY;
}
*formats = (const tbm_format *)private_display->caps_pp.formats;
*count = private_display->caps_pp.format_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
{
DISPLAY_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)) {
TDM_ERR("no pp capability");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NO_CAPABILITY;
}
if (preferred_align)
*preferred_align = private_display->caps_pp.preferred_align;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(capabilities != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) {
TDM_ERR("no capture capability");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NO_CAPABILITY;
}
*capabilities = private_display->caps_capture.capabilities;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(formats != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)) {
TDM_ERR("no capture capability");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NO_CAPABILITY;
}
*formats = (const tbm_format *)private_display->caps_capture.formats;
*count = private_display->caps_capture.format_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*count = 0;
LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
(*count)++;
if (*count == 0) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NONE;
}
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
DISPLAY_FUNC_ENTRY_ERROR();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (error)
*error = TDM_ERROR_NONE;
i = 0;
LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link) {
if (i == index) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return private_output;
}
i++;
}
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return NULL;
}
EXTERN tdm_error
tdm_display_get_fd(tdm_display *dpy, int *fd)
{
- tdm_func_display *func_display;
DISPLAY_FUNC_ENTRY();
TDM_RETURN_VAL_IF_FAIL(fd != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
-
- func_display = &private_display->func_display;
+ _pthread_mutex_lock(&private_display->lock);
- if (!func_display->display_get_fd) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
- }
+ if (tdm_thread_is_running())
+ *fd = tdm_thread_get_fd(private_display->private_loop);
+ else
+ *fd = tdm_event_loop_get_fd(private_display);
- ret = func_display->display_get_fd(private_display->bdata, fd);
-
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
EXTERN tdm_error
tdm_display_handle_events(tdm_display *dpy)
{
- tdm_func_display *func_display;
+ struct pollfd fds;
+ int fd = -1;
+
DISPLAY_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ ret = tdm_display_get_fd(dpy, &fd);
+ TDM_RETURN_VAL_IF_FAIL(fd >= 0, ret);
- func_display = &private_display->func_display;
+ fds.events = POLLIN;
+ fds.fd = fd;
+ fds.revents = 0;
- if (!func_display->display_handle_events) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ if (tdm_debug_thread)
+ TDM_INFO("fd(%d) polling in", fd);
+
+ while (poll(&fds, 1, -1) < 0) {
+ if (errno == EBUSY) /* normal case */
+ continue;
+ else {
+ TDM_ERR("poll failed: %m");
+ return TDM_ERROR_OPERATION_FAILED;
+ }
}
- ret = func_display->display_handle_events(private_display->bdata);
+ if (tdm_debug_thread)
+ TDM_INFO("fd(%d) polling out", fd);
- pthread_mutex_unlock(&private_display->lock);
+ if (tdm_thread_is_running())
+ ret = tdm_thread_handle_cb(private_display->private_loop);
+ else
+ ret = tdm_event_loop_dispatch(private_display);
return ret;
}
DISPLAY_FUNC_ENTRY_ERROR();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
pp = (tdm_pp *)tdm_pp_create_internal(private_display, error);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return pp;
}
{
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (maker)
*maker = private_output->caps.maker;
if (name)
*name = private_output->caps.name;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(status != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*status = private_output->caps.status;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
+INTERN void
+tdm_output_cb_status(tdm_output *output_backend, tdm_output_conn_status status,
+ void *user_data)
+{
+ tdm_private_display *private_display;
+ tdm_private_output *private_output = user_data;
+ tdm_value value;
+
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+ TDM_RETURN_IF_FAIL(private_output);
+
+ private_display = private_output->private_display;
+
+ if (!tdm_thread_in_display_thread(syscall(SYS_gettid))) {
+ tdm_thread_cb_output_status output_status;
+ tdm_error ret;
+
+ output_status.base.type = TDM_THREAD_CB_OUTPUT_STATUS;
+ output_status.base.length = sizeof output_status;
+ output_status.output_stamp = private_output->stamp;
+ output_status.status = status;
+ output_status.user_data = user_data;
+
+ value.u32 = status;
+ tdm_output_call_change_handler_internal(private_output,
+ &private_output->change_handler_list_sub,
+ TDM_OUTPUT_CHANGE_CONNECTION,
+ value);
+
+ ret = tdm_thread_send_cb(private_display->private_loop, &output_status.base);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ return;
+ }
+
+ value.u32 = status;
+ tdm_output_call_change_handler_internal(private_output,
+ &private_output->change_handler_list_main,
+ TDM_OUTPUT_CHANGE_CONNECTION,
+ value);
+}
+
+EXTERN tdm_error
+tdm_output_add_change_handler(tdm_output *output,
+ tdm_output_change_handler func,
+ void *user_data)
+{
+ tdm_private_change_handler *change_handler;
+ OUTPUT_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ pthread_mutex_lock(&private_display->lock);
+
+ if (!private_output->regist_change_cb) {
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
+ }
+
+ change_handler = calloc(1, sizeof(tdm_private_change_handler));
+ if (!change_handler) {
+ TDM_ERR("failed: alloc memory");
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_OUT_OF_MEMORY;
+ }
+
+ change_handler->private_output = private_output;
+ change_handler->func = func;
+ change_handler->user_data = user_data;
+ change_handler->owner_tid = syscall(SYS_gettid);
+
+ if (!tdm_thread_in_display_thread(change_handler->owner_tid))
+ LIST_ADD(&change_handler->link, &private_output->change_handler_list_sub);
+ else
+ LIST_ADD(&change_handler->link, &private_output->change_handler_list_main);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+EXTERN void
+tdm_output_remove_change_handler(tdm_output *output,
+ tdm_output_change_handler func,
+ void *user_data)
+{
+ tdm_private_display *private_display;
+ tdm_private_output *private_output;
+ tdm_private_change_handler *h = NULL, *hh = NULL;
+
+ TDM_RETURN_IF_FAIL(output != NULL);
+ TDM_RETURN_IF_FAIL(func != NULL);
+
+ private_output = (tdm_private_output*)output;
+ private_display = private_output->private_display;
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ LIST_FOR_EACH_ENTRY_SAFE(h, hh, &private_output->change_handler_list_main, link) {
+ if (h->func != func || h->user_data != user_data)
+ continue;
+
+ LIST_DEL(&h->link);
+ free(h);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return;
+ }
+
+ LIST_FOR_EACH_ENTRY_SAFE(h, hh, &private_output->change_handler_list_sub, link) {
+ if (h->func != func || h->user_data != user_data)
+ continue;
+
+ LIST_DEL(&h->link);
+ free(h);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return;
+ }
+
+ _pthread_mutex_unlock(&private_display->lock);
+}
+
EXTERN tdm_error
tdm_output_get_output_type(tdm_output *output, tdm_output_type *type)
{
TDM_RETURN_VAL_IF_FAIL(type != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*type = private_output->caps.type;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*count = 0;
LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link)
(*count)++;
if (*count == 0) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NONE;
}
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
OUTPUT_FUNC_ENTRY_ERROR();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (error)
*error = TDM_ERROR_NONE;
LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link) {
if (i == index) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return private_layer;
}
i++;
}
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return NULL;
}
TDM_RETURN_VAL_IF_FAIL(props != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*props = (const tdm_prop *)private_output->caps.props;
*count = private_output->caps.prop_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(modes != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*modes = (const tdm_output_mode *)private_output->caps.modes;
*count = private_output->caps.mode_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
{
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (min_w)
*min_w = private_output->caps.min_w;
if (preferred_align)
*preferred_align = private_output->caps.preferred_align;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
{
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (mmWidth)
*mmWidth = private_output->caps.mmWidth;
if (mmHeight)
*mmHeight = private_output->caps.mmHeight;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
OUTPUT_FUNC_ENTRY();
TDM_RETURN_VAL_IF_FAIL(subpixel != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*subpixel = private_output->caps.subpixel;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
OUTPUT_FUNC_ENTRY();
TDM_RETURN_VAL_IF_FAIL(pipe != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*pipe = private_output->pipe;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tdm_func_output *func_output;
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_output = &private_display->func_output;
if (!func_output->output_set_property) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_output->output_set_property(private_output->output_backend, id,
value);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(value != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_output = &private_display->func_output;
if (!func_output->output_get_property) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_output->output_get_property(private_output->output_backend, id,
value);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
-static void
-_tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
- unsigned int tv_sec, unsigned int tv_usec, void *user_data)
+INTERN void
+tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
+ unsigned int tv_sec, unsigned int tv_usec, void *user_data)
{
tdm_private_vblank_handler *vblank_handler = user_data;
tdm_private_display *private_display;
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
TDM_RETURN_IF_FAIL(vblank_handler);
private_display = vblank_handler->private_output->private_display;
+ if (vblank_handler->owner_tid != syscall(SYS_gettid)) {
+ tdm_thread_cb_output_vblank output_vblank;
+ tdm_error ret;
+
+ output_vblank.base.type = TDM_THREAD_CB_OUTPUT_VBLANK;
+ output_vblank.base.length = sizeof output_vblank;
+ output_vblank.output_stamp = vblank_handler->private_output->stamp;
+ output_vblank.sequence = sequence;
+ output_vblank.tv_sec = tv_sec;
+ output_vblank.tv_usec = tv_usec;
+ output_vblank.user_data = user_data;
+
+ ret = tdm_thread_send_cb(private_display->private_loop, &output_vblank.base);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ return;
+ }
+
+ if (vblank_handler->owner_tid != syscall(SYS_gettid))
+ TDM_NEVER_GET_HERE();
+
if (vblank_handler->func) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
vblank_handler->func(vblank_handler->private_output, sequence,
tv_sec, tv_usec, vblank_handler->user_data);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
}
LIST_DEL(&vblank_handler->link);
free(vblank_handler);
}
-static void
-_tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence,
- unsigned int tv_sec, unsigned int tv_usec, void *user_data)
+INTERN void
+tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence,
+ unsigned int tv_sec, unsigned int tv_usec, void *user_data)
{
tdm_private_commit_handler *commit_handler = user_data;
tdm_private_display *private_display;
tdm_private_output *private_output;
tdm_private_layer *private_layer = NULL;
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
TDM_RETURN_IF_FAIL(commit_handler);
private_output = commit_handler->private_output;
private_display = private_output->private_display;
+ if (commit_handler->owner_tid != syscall(SYS_gettid)) {
+ tdm_thread_cb_output_commit output_commit;
+ tdm_error ret;
+
+ output_commit.base.type = TDM_THREAD_CB_OUTPUT_COMMIT;
+ output_commit.base.length = sizeof output_commit;
+ output_commit.output_stamp = private_output->stamp;
+ output_commit.sequence = sequence;
+ output_commit.tv_sec = tv_sec;
+ output_commit.tv_usec = tv_usec;
+ output_commit.user_data = user_data;
+
+ ret = tdm_thread_send_cb(private_display->private_loop, &output_commit.base);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ return;
+ }
+
LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link) {
if (!private_layer->waiting_buffer)
continue;
if (private_layer->showing_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->showing_buffer);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (private_layer->buffer_queue) {
- pthread_mutex_unlock(&private_display->lock);
tbm_surface_queue_release(private_layer->buffer_queue,
private_layer->showing_buffer);
- pthread_mutex_lock(&private_display->lock);
}
}
private_layer->showing_buffer = private_layer->waiting_buffer;
private_layer->waiting_buffer = NULL;
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p) showing_buffer(%p)",
+ private_layer, private_layer->waiting_buffer,
+ private_layer->showing_buffer);
}
if (commit_handler->func) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
commit_handler->func(private_output, sequence,
tv_sec, tv_usec, commit_handler->user_data);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
}
LIST_DEL(&commit_handler->link);
tdm_private_vblank_handler *vblank_handler;
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (private_output->current_dpms_value > TDM_OUTPUT_DPMS_ON) {
+ TDM_ERR("output(%d) dpms: %s", private_output->pipe,
+ dpms_str(private_output->current_dpms_value));
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_BAD_REQUEST;
+ }
func_output = &private_display->func_output;
if (!func_output->output_wait_vblank) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
vblank_handler = calloc(1, sizeof(tdm_private_vblank_handler));
if (!vblank_handler) {
TDM_ERR("failed: alloc memory");
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_OUT_OF_MEMORY;
}
vblank_handler->private_output = private_output;
vblank_handler->func = func;
vblank_handler->user_data = user_data;
+ vblank_handler->owner_tid = syscall(SYS_gettid);
ret = func_output->output_wait_vblank(private_output->output_backend, interval,
sync, vblank_handler);
if (ret != TDM_ERROR_NONE) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
if (!private_output->regist_vblank_cb) {
private_output->regist_vblank_cb = 1;
ret = func_output->output_set_vblank_handler(private_output->output_backend,
- _tdm_output_cb_vblank);
+ tdm_output_cb_vblank);
}
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
func_output = &private_display->func_output;
if (!func_output->output_commit) {
- return TDM_ERROR_NONE;
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
commit_handler = calloc(1, sizeof(tdm_private_commit_handler));
commit_handler->private_output = private_output;
commit_handler->func = func;
commit_handler->user_data = user_data;
+ commit_handler->owner_tid = syscall(SYS_gettid);
ret = func_output->output_commit(private_output->output_backend, sync,
commit_handler);
- if (ret != TDM_ERROR_NONE) {
- return ret;
- }
+ TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
if (!private_output->regist_commit_cb) {
private_output->regist_commit_cb = 1;
ret = func_output->output_set_commit_handler(private_output->output_backend,
- _tdm_output_cb_commit);
+ tdm_output_cb_commit);
}
return ret;
{
OUTPUT_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (private_output->current_dpms_value > TDM_OUTPUT_DPMS_ON) {
+ TDM_ERR("output(%d) dpms: %s", private_output->pipe,
+ dpms_str(private_output->current_dpms_value));
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_BAD_REQUEST;
+ }
ret = _tdm_output_commit(output, sync, func, user_data);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(mode != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_output = &private_display->func_output;
if (!func_output->output_set_mode) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_output->output_set_mode(private_output->output_backend, mode);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(mode != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_output = &private_display->func_output;
if (!func_output->output_get_mode) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_output->output_get_mode(private_output->output_backend, mode);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
else if (dpms_value > TDM_OUTPUT_DPMS_OFF)
dpms_value = TDM_OUTPUT_DPMS_OFF;
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (private_output->current_dpms_value == dpms_value) {
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
func_output = &private_display->func_output;
if (!func_output->output_set_dpms) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
+ private_output->current_dpms_value = dpms_value;
+ TDM_WRN("not implemented!!");
return TDM_ERROR_NONE;
}
ret = func_output->output_set_dpms(private_output->output_backend, dpms_value);
+ if (ret == TDM_ERROR_NONE) {
+ tdm_value value;
- pthread_mutex_unlock(&private_display->lock);
+ private_output->current_dpms_value = dpms_value;
+
+ value.u32 = dpms_value;
+ tdm_output_call_change_handler_internal(private_output,
+ &private_output->change_handler_list_main,
+ TDM_OUTPUT_CHANGE_DPMS,
+ value);
+ }
+
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(dpms_value != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_output = &private_display->func_output;
if (!func_output->output_get_dpms) {
- pthread_mutex_unlock(&private_display->lock);
+ *dpms_value = private_output->current_dpms_value;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_WRN("not implemented!!");
return TDM_ERROR_NONE;
}
ret = func_output->output_get_dpms(private_output->output_backend, dpms_value);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
OUTPUT_FUNC_ENTRY_ERROR();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
capture = (tdm_capture *)tdm_capture_create_output_internal(private_output,
error);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return capture;
}
+INTERN void
+tdm_output_call_change_handler_internal(tdm_private_output *private_output,
+ struct list_head *change_handler_list,
+ tdm_output_change_type type,
+ tdm_value value)
+{
+ tdm_private_display *private_display;
+ tdm_private_change_handler *change_handler;
+
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+ TDM_RETURN_IF_FAIL(private_output);
+
+ private_display = private_output->private_display;
+ if (!tdm_thread_in_display_thread(syscall(SYS_gettid))) {
+ if (type & TDM_OUTPUT_CHANGE_CONNECTION)
+ TDM_INFO("output(%d) changed: %s (%d)",
+ private_output->pipe, status_str(value.u32), value.u32);
+ if (type & TDM_OUTPUT_CHANGE_DPMS)
+ TDM_INFO("output(%d) changed: dpms %s (%d)",
+ private_output->pipe, dpms_str(value.u32), value.u32);
+ }
+
+ if (LIST_IS_EMPTY(change_handler_list))
+ return;
+
+ LIST_FOR_EACH_ENTRY(change_handler, change_handler_list, link) {
+ if (change_handler->owner_tid != syscall(SYS_gettid))
+ TDM_NEVER_GET_HERE();
+
+ _pthread_mutex_unlock(&private_display->lock);
+ change_handler->func(private_output, type,
+ value, change_handler->user_data);
+ _pthread_mutex_lock(&private_display->lock);
+ }
+}
+
EXTERN tdm_error
tdm_layer_get_capabilities(tdm_layer *layer, tdm_layer_capability *capabilities)
{
TDM_RETURN_VAL_IF_FAIL(capabilities != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*capabilities = private_layer->caps.capabilities;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(formats != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*formats = (const tbm_format *)private_layer->caps.formats;
*count = private_layer->caps.format_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(props != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*props = (const tdm_prop *)private_layer->caps.props;
*count = private_layer->caps.prop_count;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(zpos != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*zpos = private_layer->caps.zpos;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tdm_func_layer *func_layer;
LAYER_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (!func_layer->layer_set_property) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_set_property(private_layer->layer_backend, id, value);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(value != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (!func_layer->layer_get_property) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_get_property(private_layer->layer_backend, id, value);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(info != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
private_layer->usable = 0;
if (!func_layer->layer_set_info) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
- TDM_INFO("layer info: src(%dx%d %d,%d %dx%d %c%c%c%c) dst(%d,%d %dx%d) trans(%d)",
- info->src_config.size.h, info->src_config.size.v,
+ TDM_INFO("layer(%p) info: src(%dx%d %d,%d %dx%d %c%c%c%c) dst(%d,%d %dx%d) trans(%d)",
+ private_layer, 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->transform);
ret = func_layer->layer_set_info(private_layer->layer_backend, info);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(info != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (!func_layer->layer_get_info) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_get_info(private_layer->layer_backend, info);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
+static void
+_tdm_layer_dump_buffer(tdm_layer *layer, tbm_surface_h buffer)
+{
+ tdm_private_layer *private_layer = (tdm_private_layer*)layer;
+ tdm_private_output *private_output = private_layer->private_output;
+ char *path = NULL;
+ int count;
+ unsigned int pipe;
+ int zpos;
+ char fullpath[PATH_MAX];
+ tbm_surface_info_s info;
+ tbm_surface_error_e err;
+
+ path = tdm_helper_get_dump_path();
+ if (!path)
+ return;
+
+ count = tdm_helper_get_dump_count();
+ if (count <= 0)
+ return;
+
+ err = tbm_surface_map(buffer, TBM_SURF_OPTION_READ, &info);
+ TDM_RETURN_IF_FAIL(err == TBM_SURFACE_ERROR_NONE);
+
+ pipe = private_output->pipe;
+ zpos = private_layer->caps.zpos;
+
+ if (info.format == TBM_FORMAT_ARGB8888 || info.format == TBM_FORMAT_XRGB8888)
+ snprintf(fullpath, sizeof(fullpath), "%s/%03d_out_%d_lyr_%d.png",
+ path, count, pipe, zpos);
+ else
+ snprintf(fullpath, sizeof(fullpath), "%s/%03d_out_%d_lyr_%d_%dx%d_%c%c%c%c.yuv",
+ path, count, pipe, zpos, info.planes[0].stride, info.height, FOURCC_STR(info.format));
+
+ tbm_surface_unmap(buffer);
+
+ tdm_helper_dump_buffer(buffer, fullpath);
+ TDM_DBG("%d, %s dump excute", count, fullpath);
+
+ return;
+}
+
EXTERN tdm_error
tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
{
tdm_func_layer *func_layer;
+
LAYER_FUNC_ENTRY();
TDM_RETURN_VAL_IF_FAIL(buffer != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
private_layer->usable = 0;
if (!func_layer->layer_set_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
- if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- tdm_buffer_unref_backend(private_layer->waiting_buffer);
- pthread_mutex_lock(&private_display->lock);
- }
-
- private_layer->waiting_buffer = tdm_buffer_ref_backend(buffer);
-
ret = func_layer->layer_set_buffer(private_layer->layer_backend, buffer);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ /* dump buffer */
+ if (tdm_dump_enable)
+ _tdm_layer_dump_buffer(layer, buffer);
+
+ if (ret == TDM_ERROR_NONE) {
+ /* FIXME: should save to pending_buffer first. And after committing
+ * successfully, need to move to waiting_buffer.
+ */
+ if (private_layer->waiting_buffer) {
+ _pthread_mutex_unlock(&private_display->lock);
+ tdm_buffer_unref_backend(private_layer->waiting_buffer);
+ _pthread_mutex_lock(&private_display->lock);
+ }
- pthread_mutex_unlock(&private_display->lock);
+ private_layer->waiting_buffer = tdm_buffer_ref_backend(buffer);
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p)",
+ private_layer, private_layer->waiting_buffer);
+ }
+
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tdm_func_layer *func_layer;
LAYER_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->waiting_buffer);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
private_layer->waiting_buffer = NULL;
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p)",
+ private_layer, private_layer->waiting_buffer);
}
if (private_layer->showing_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->showing_buffer);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
private_layer->showing_buffer = NULL;
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) showing_buffer(%p)",
+ private_layer, private_layer->showing_buffer);
}
private_layer->usable = 1;
if (!func_layer->layer_unset_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_unset_buffer(private_layer->layer_backend);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tbm_surface_h surface = NULL;
LAYER_FUNC_ENTRY_VOID_RETURN();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (!func_layer->layer_set_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return;
}
if (TBM_SURFACE_QUEUE_ERROR_NONE != tbm_surface_queue_acquire(
private_layer->buffer_queue, &surface) ||
surface == NULL) {
- TDM_ERR("tbm_surface_queue_acquire() failed surface:%p", surface);
- pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("layer(%p) tbm_surface_queue_acquire() failed surface:%p",
+ private_layer, surface);
+ _pthread_mutex_unlock(&private_display->lock);
return;
}
- if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- tdm_buffer_unref_backend(private_layer->waiting_buffer);
- tbm_surface_queue_release(private_layer->buffer_queue,
- private_layer->waiting_buffer);
- pthread_mutex_lock(&private_display->lock);
- }
+ ret = func_layer->layer_set_buffer(private_layer->layer_backend, surface);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ if (ret == TDM_ERROR_NONE) {
+ if (private_layer->waiting_buffer) {
+ _pthread_mutex_unlock(&private_display->lock);
+ tdm_buffer_unref_backend(private_layer->waiting_buffer);
+ tbm_surface_queue_release(private_layer->buffer_queue,
+ private_layer->waiting_buffer);
+ _pthread_mutex_lock(&private_display->lock);
+ }
- private_layer->waiting_buffer = tdm_buffer_ref_backend(surface);
+ private_layer->waiting_buffer = tdm_buffer_ref_backend(surface);
- func_layer->layer_set_buffer(private_layer->layer_backend, surface);
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p)",
+ private_layer, private_layer->waiting_buffer);
- ret = _tdm_output_commit(private_layer->private_output, 0, NULL, NULL);
- if (ret != TDM_ERROR_NONE)
- TDM_ERR("_tdm_output_commit() is fail");
+ ret = _tdm_output_commit(private_layer->private_output, 0, NULL, NULL);
+ if (ret != TDM_ERROR_NONE)
+ TDM_ERR("layer(%p) _tdm_output_commit() is fail", private_layer);
+ }
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
}
static void
LAYER_FUNC_ENTRY_VOID_RETURN();
TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->waiting_buffer);
tbm_surface_queue_release(private_layer->buffer_queue,
private_layer->waiting_buffer);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
}
private_layer->buffer_queue = NULL;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
}
EXTERN tdm_error
TDM_RETURN_VAL_IF_FAIL(buffer_queue != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
private_layer->usable = 0;
if (!func_layer->layer_set_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
if (buffer_queue == private_layer->buffer_queue) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NONE;
}
if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->waiting_buffer);
tbm_surface_queue_release(private_layer->buffer_queue,
private_layer->waiting_buffer);
private_layer->waiting_buffer = NULL;
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p)",
+ private_layer, private_layer->waiting_buffer);
}
private_layer->buffer_queue = buffer_queue;
- tbm_surface_queue_set_acquirable_cb(private_layer->buffer_queue,
+ tbm_surface_queue_add_acquirable_cb(private_layer->buffer_queue,
_tbm_layer_queue_acquirable_cb,
layer);
- tbm_surface_queue_set_destroy_cb(private_layer->buffer_queue,
+ tbm_surface_queue_add_destroy_cb(private_layer->buffer_queue,
_tbm_layer_queue_destroy_cb,
layer);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tdm_func_layer *func_layer;
LAYER_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (private_layer->waiting_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->waiting_buffer);
tbm_surface_queue_release(private_layer->buffer_queue,
private_layer->waiting_buffer);
private_layer->waiting_buffer = NULL;
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) waiting_buffer(%p)",
+ private_layer, private_layer->waiting_buffer);
}
if (private_layer->showing_buffer) {
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
tdm_buffer_unref_backend(private_layer->showing_buffer);
tbm_surface_queue_release(private_layer->buffer_queue,
private_layer->showing_buffer);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
private_layer->showing_buffer = NULL;
+
+ if (tdm_debug_buffer)
+ TDM_INFO("layer(%p) showing_buffer(%p)",
+ private_layer, private_layer->showing_buffer);
}
- tbm_surface_queue_set_acquirable_cb(private_layer->buffer_queue, NULL, NULL);
- tbm_surface_queue_set_destroy_cb(private_layer->buffer_queue, NULL, NULL);
+ tbm_surface_queue_remove_acquirable_cb(private_layer->buffer_queue, _tbm_layer_queue_acquirable_cb, layer);
+ tbm_surface_queue_remove_destroy_cb(private_layer->buffer_queue, _tbm_layer_queue_destroy_cb, layer);
private_layer->buffer_queue = NULL;
private_layer->usable = 1;
if (!func_layer->layer_unset_buffer) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_unset_buffer(private_layer->layer_backend);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
TDM_RETURN_VAL_IF_FAIL(usable != NULL, TDM_ERROR_INVALID_PARAMETER);
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
*usable = private_layer->usable;
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
tdm_func_layer *func_layer;
LAYER_FUNC_ENTRY();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
func_layer = &private_display->func_layer;
if (!(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) {
- TDM_ERR("layer is not video layer");
- pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("layer(%p) is not video layer", private_layer);
+ _pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_INVALID_PARAMETER;
}
if (!func_layer->layer_set_video_pos) {
- pthread_mutex_unlock(&private_display->lock);
- return TDM_ERROR_NONE;
+ _pthread_mutex_unlock(&private_display->lock);
+ TDM_ERR("not implemented!!");
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
ret = func_layer->layer_set_video_pos(private_layer->layer_backend, zpos);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return ret;
}
LAYER_FUNC_ENTRY_ERROR();
- pthread_mutex_lock(&private_display->lock);
+ _pthread_mutex_lock(&private_display->lock);
capture = (tdm_capture *)tdm_capture_create_layer_internal(private_layer,
error);
- pthread_mutex_unlock(&private_display->lock);
+ _pthread_mutex_unlock(&private_display->lock);
return capture;
}
projects / platform / core / uifw / libtdm.git / blobdiff