summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch
diff options
context:
space:
mode:
authorKarthik Ramanan <a0393906@ti.com>2017-03-30 13:42:50 +0530
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-04-04 08:49:07 +0000
commite5647d8e3da999c353a48c139c9a968705c5a891 (patch)
tree42cdea20ccabfddf5bb836913a32da04572edc1e /meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch
parent8b721aa4ae997a5e18d97d5125038f1cd4640949 (diff)
dra7xx: gstreamer1.0-plugins-bad: Upgrade to 1.8.2
Apart from upgrading to 1.8.2 as the base, it also contains several TI specific patches that are required to enable functionality for kmssink and waylandsink. A few bug fixes have also been included in this patch set. This recipe is rehosted from meta-arago Change-Id: I2a5b95db1b0e6b2b907f3e82ff738fd8124c0998 Signed-off-by: Karthik Ramanan <a0393906@ti.com>
Diffstat (limited to 'meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch')
-rw-r--r--meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch404
1 files changed, 404 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch b/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch
new file mode 100644
index 000000000..06d28bc82
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0001-Enable-mouse-movement-for-videos-on-waylandsink.patch
@@ -0,0 +1,404 @@
+From 90fafb6ea39940161f3bf86ab7f557197ff389ff Mon Sep 17 00:00:00 2001
+From: Pooja Prajod <a0132412@ti.com>
+Date: Fri, 26 Feb 2016 16:46:39 -0500
+Subject: [PATCH] Enable mouse movement for videos on waylandsink
+
+This patch enables grab, drag and ungrab of videos
+that are being played on waylandsink.
+
+Signed-off-by: Pooja Prajod <a0132412@ti.com>
+---
+ ext/wayland/gstwaylandsink.c | 283 +++++++++++++++++++++++++++++++++++++++++++
+ ext/wayland/gstwaylandsink.h | 26 ++++
+ 2 files changed, 309 insertions(+)
+
+diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
+index cabf310..7394a2b 100644
+--- a/ext/wayland/gstwaylandsink.c
++++ b/ext/wayland/gstwaylandsink.c
+@@ -41,6 +41,7 @@
+ #endif
+
+ #include "gstwaylandsink.h"
++#include <linux/input.h>
+
+ /* signals */
+ enum
+@@ -100,6 +101,9 @@ static void create_window (GstWaylandSink * sink, struct display *display,
+ int width, int height);
+ static void shm_pool_destroy (struct shm_pool *pool);
+
++static void input_grab (struct input *input, struct window *window);
++static void input_ungrab (struct input *input);
++
+ typedef struct
+ {
+ uint32_t wl_format;
+@@ -225,6 +229,54 @@ gst_wayland_sink_set_property (GObject * object,
+ }
+
+ static void
++input_grab (struct input *input, struct window *window)
++{
++ input->grab = window;
++}
++
++static void
++input_ungrab (struct input *input)
++{
++ input->grab = NULL;
++}
++
++static void
++input_remove_pointer_focus (struct input *input)
++{
++ struct window *window = input->pointer_focus;
++
++ if (!window)
++ return;
++
++ input->pointer_focus = NULL;
++}
++
++static void
++input_destroy (struct input *input)
++{
++ input_remove_pointer_focus (input);
++
++ if (input->display->seat_version >= 3) {
++ if (input->pointer)
++ wl_pointer_release (input->pointer);
++ }
++
++ wl_list_remove (&input->link);
++ wl_seat_destroy (input->seat);
++ free (input);
++}
++
++static void
++display_destroy_inputs (struct display *display)
++{
++ struct input *tmp;
++ struct input *input;
++
++ wl_list_for_each_safe (input, tmp, &display->input_list, link)
++ input_destroy (input);
++}
++
++static void
+ destroy_display (struct display *display)
+ {
+ if (display->shm)
+@@ -236,6 +288,7 @@ destroy_display (struct display *display)
+ if (display->compositor)
+ wl_compositor_destroy (display->compositor);
+
++ display_destroy_inputs (display);
+ wl_display_flush (display->display);
+ wl_display_disconnect (display->display);
+ free (display);
+@@ -318,6 +371,229 @@ struct wl_shm_listener shm_listenter = {
+ shm_format
+ };
+
++
++static void
++pointer_handle_enter (void *data, struct wl_pointer *pointer,
++ uint32_t serial, struct wl_surface *surface,
++ wl_fixed_t sx_w, wl_fixed_t sy_w)
++{
++ struct input *input = data;
++
++ if (!surface) {
++ /* enter event for a window we've just destroyed */
++ return;
++ }
++
++ input->display->serial = serial;
++ input->pointer_focus = wl_surface_get_user_data (surface);
++}
++
++static void
++pointer_handle_leave (void *data, struct wl_pointer *pointer,
++ uint32_t serial, struct wl_surface *surface)
++{
++ struct input *input = data;
++
++ input_remove_pointer_focus (input);
++}
++
++static void
++pointer_handle_motion (void *data, struct wl_pointer *pointer,
++ uint32_t time, wl_fixed_t sx_w, wl_fixed_t sy_w)
++{
++ struct input *input = data;
++ struct window *window = input->pointer_focus;
++
++ if (!window)
++ return;
++
++ if (input->grab)
++ wl_shell_surface_move (input->grab->shell_surface, input->seat,
++ input->display->serial);
++
++}
++
++static void
++pointer_handle_button (void *data, struct wl_pointer *pointer, uint32_t serial,
++ uint32_t time, uint32_t button, uint32_t state_w)
++{
++ struct input *input = data;
++ enum wl_pointer_button_state state = state_w;
++ input->display->serial = serial;
++
++ if (button == BTN_LEFT) {
++ if (state == WL_POINTER_BUTTON_STATE_PRESSED)
++ input_grab (input, input->pointer_focus);
++
++ if (input->grab && state == WL_POINTER_BUTTON_STATE_RELEASED)
++ input_ungrab (input);
++ }
++
++ if (input->grab)
++ wl_shell_surface_move (input->grab->shell_surface, input->seat,
++ input->display->serial);
++}
++
++static void
++pointer_handle_axis (void *data, struct wl_pointer *pointer,
++ uint32_t time, uint32_t axis, wl_fixed_t value)
++{
++}
++
++static const struct wl_pointer_listener pointer_listener = {
++ pointer_handle_enter,
++ pointer_handle_leave,
++ pointer_handle_motion,
++ pointer_handle_button,
++ pointer_handle_axis,
++};
++
++static void
++touch_handle_down (void *data, struct wl_touch *wl_touch,
++ uint32_t serial, uint32_t time, struct wl_surface *surface,
++ int32_t id, wl_fixed_t x_w, wl_fixed_t y_w)
++{
++ struct input *input = data;
++ struct touch_point *tp;
++
++ input->display->serial = serial;
++ input->touch_focus = wl_surface_get_user_data (surface);
++ if (!input->touch_focus) {
++ return;
++ }
++
++ tp = malloc (sizeof *tp);
++ if (tp) {
++ tp->id = id;
++ wl_list_insert (&input->touch_point_list, &tp->link);
++ wl_shell_surface_move (input->touch_focus->shell_surface, input->seat,
++ serial);
++ }
++}
++
++static void
++touch_handle_motion (void *data, struct wl_touch *wl_touch,
++ uint32_t time, int32_t id, wl_fixed_t x_w, wl_fixed_t y_w)
++{
++ struct input *input = data;
++ struct touch_point *tp;
++
++
++ if (!input->touch_focus) {
++ return;
++ }
++ wl_list_for_each (tp, &input->touch_point_list, link) {
++ if (tp->id != id)
++ continue;
++
++ wl_shell_surface_move (input->touch_focus->shell_surface, input->seat,
++ input->display->serial);
++
++ return;
++ }
++}
++
++static void
++touch_handle_frame (void *data, struct wl_touch *wl_touch)
++{
++}
++
++static void
++touch_handle_cancel (void *data, struct wl_touch *wl_touch)
++{
++}
++
++static void
++touch_handle_up (void *data, struct wl_touch *wl_touch,
++ uint32_t serial, uint32_t time, int32_t id)
++{
++ struct input *input = data;
++ struct touch_point *tp, *tmp;
++
++ if (!input->touch_focus) {
++ return;
++ }
++
++ wl_list_for_each_safe (tp, tmp, &input->touch_point_list, link) {
++ if (tp->id != id)
++ continue;
++
++ wl_list_remove (&tp->link);
++ free (tp);
++
++ return;
++ }
++}
++
++static const struct wl_touch_listener touch_listener = {
++ touch_handle_down,
++ touch_handle_up,
++ touch_handle_motion,
++ touch_handle_frame,
++ touch_handle_cancel,
++};
++
++
++
++static void
++seat_handle_capabilities (void *data, struct wl_seat *seat,
++ enum wl_seat_capability caps)
++{
++ struct input *input = data;
++
++ if ((caps & WL_SEAT_CAPABILITY_POINTER) && !input->pointer) {
++ input->pointer = wl_seat_get_pointer (seat);
++ wl_pointer_set_user_data (input->pointer, input);
++ wl_pointer_add_listener (input->pointer, &pointer_listener, input);
++ } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
++ wl_pointer_destroy (input->pointer);
++ input->pointer = NULL;
++ }
++
++ if ((caps & WL_SEAT_CAPABILITY_TOUCH) && !input->touch) {
++ input->touch = wl_seat_get_touch (seat);
++ wl_touch_set_user_data (input->touch, input);
++ wl_touch_add_listener (input->touch, &touch_listener, input);
++ } else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && input->touch) {
++ wl_touch_destroy (input->touch);
++ input->touch = NULL;
++ }
++}
++
++static void
++seat_handle_name (void *data, struct wl_seat *seat, const char *name)
++{
++
++}
++
++static const struct wl_seat_listener seat_listener = {
++ seat_handle_capabilities,
++ seat_handle_name
++};
++
++static void
++display_add_input (struct display *d, uint32_t id)
++{
++ struct input *input;
++
++ input = calloc (1, sizeof (*input));
++ if (input == NULL) {
++ fprintf (stderr, "%s: out of memory\n", "gst-wayland-sink");
++ exit (EXIT_FAILURE);
++ }
++ input->display = d;
++ input->seat = wl_registry_bind (d->registry, id, &wl_seat_interface,
++ MAX (d->seat_version, 3));
++ input->touch_focus = NULL;
++ input->pointer_focus = NULL;
++ wl_list_init (&input->touch_point_list);
++ wl_list_insert (d->input_list.prev, &input->link);
++
++ wl_seat_add_listener (input->seat, &seat_listener, input);
++ wl_seat_set_user_data (input->seat, input);
++
++}
++
+ static void
+ registry_handle_global (void *data, struct wl_registry *registry,
+ uint32_t id, const char *interface, uint32_t version)
+@@ -332,6 +608,9 @@ registry_handle_global (void *data, struct wl_registry *registry,
+ } else if (strcmp (interface, "wl_shm") == 0) {
+ d->shm = wl_registry_bind (registry, id, &wl_shm_interface, 1);
+ wl_shm_add_listener (d->shm, &shm_listenter, d);
++ } else if (strcmp (interface, "wl_seat") == 0) {
++ d->seat_version = version;
++ display_add_input (d, id);
+ }
+ }
+
+@@ -352,6 +631,8 @@ create_display (void)
+ return NULL;
+ }
+
++ wl_list_init (&display->input_list);
++
+ display->registry = wl_display_get_registry (display->display);
+ wl_registry_add_listener (display->registry, &registry_listener, display);
+
+@@ -491,6 +772,8 @@ create_window (GstWaylandSink * sink, struct display *display, int width,
+
+ window->surface = wl_compositor_create_surface (display->compositor);
+
++ wl_surface_set_user_data (window->surface, window);
++
+ window->shell_surface = wl_shell_get_shell_surface (display->shell,
+ window->surface);
+
+diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h
+index cb3383e..f7d30dc 100644
+--- a/ext/wayland/gstwaylandsink.h
++++ b/ext/wayland/gstwaylandsink.h
+@@ -55,6 +55,27 @@
+ #define GST_WAYLAND_SINK_GET_CLASS(inst) \
+ (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_WAYLAND_SINK, GstWaylandSinkClass))
+
++struct touch_point
++{
++ int32_t id;
++ struct wl_list link;
++};
++
++struct input
++{
++ struct display *display;
++ struct wl_seat *seat;
++ struct wl_pointer *pointer;
++ struct wl_touch *touch;
++ struct wl_list touch_point_list;
++ struct window *pointer_focus;
++ struct window *touch_focus;
++ struct wl_list link;
++ struct window *grab;
++
++};
++
++
+ struct display
+ {
+ struct wl_display *display;
+@@ -63,6 +84,11 @@ struct display
+ struct wl_shell *shell;
+ struct wl_shm *shm;
+ uint32_t formats;
++
++ struct wl_list input_list;
++ int seat_version;
++ uint32_t serial;
++
+ };
+
+ struct window
+--
+1.9.1
+