gtksink: Port to GtkGstBaseWidget

https://bugzilla.gnome.org/show_bug.cgi?id=752441

diff --git a/ext/gtk/gstgtksink.c b/ext/gtk/gstgtksink.c
index 9c442e3..c171c60 100644 (file)
--- a/ext/gtk/gstgtksink.c
+++ b/ext/gtk/gstgtksink.c
@@ -172,7 +172,7 @@ widget_destroy_cb (GtkWidget * widget, GstGtkSink * gtk_sink)
   GST_OBJECT_UNLOCK (gtk_sink);
 }
 
-static GtkGstWidget *
+static GtkGstBaseWidget *
 gst_gtk_sink_get_widget (GstGtkSink * gtk_sink)
 {
   if (gtk_sink->widget != NULL)
@@ -185,7 +185,7 @@ gst_gtk_sink_get_widget (GstGtkSink * gtk_sink)
     return NULL;
   }
 
-  gtk_sink->widget = (GtkGstWidget *) gtk_gst_widget_new ();
+  gtk_sink->widget = (GtkGstBaseWidget *) gtk_gst_widget_new ();
   gtk_sink->bind_aspect_ratio =
       g_object_bind_property (gtk_sink, "force-aspect-ratio", gtk_sink->widget,
       "force-aspect-ratio", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -323,7 +323,7 @@ gst_gtk_sink_change_state (GstElement * element, GstStateChange transition)
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       GST_OBJECT_LOCK (gtk_sink);
       if (gtk_sink->widget)
-        gtk_gst_widget_set_buffer (gtk_sink->widget, NULL);
+        gtk_gst_base_widget_set_buffer (gtk_sink->widget, NULL);
       GST_OBJECT_UNLOCK (gtk_sink);
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
@@ -368,8 +368,19 @@ gst_gtk_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
   if (!gst_video_info_from_caps (&gtk_sink->v_info, caps))
     return FALSE;
 
-  if (!gtk_gst_widget_set_caps (gtk_sink->widget, caps))
+  GST_OBJECT_LOCK (gtk_sink);
+
+  if (gtk_sink->widget == NULL) {
+    GST_OBJECT_UNLOCK (gtk_sink);
+    GST_ELEMENT_ERROR (gtk_sink, RESOURCE, NOT_FOUND,
+        ("%s", "Output widget was destroyed"), (NULL));
     return FALSE;
+  }
+
+  if (!gtk_gst_base_widget_set_caps (gtk_sink->widget, caps))
+    return FALSE;
+
+  GST_OBJECT_UNLOCK (gtk_sink);
 
   return TRUE;
 }
@@ -386,15 +397,15 @@ gst_gtk_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
   GST_OBJECT_LOCK (vsink);
 
   if (gtk_sink->widget == NULL) {
-    GST_OBJECT_UNLOCK (vsink);
+    GST_OBJECT_UNLOCK (gtk_sink);
     GST_ELEMENT_ERROR (gtk_sink, RESOURCE, NOT_FOUND,
         ("%s", "Output widget was destroyed"), (NULL));
     return GST_FLOW_ERROR;
   }
 
-  gtk_gst_widget_set_buffer (gtk_sink->widget, buf);
+  gtk_gst_base_widget_set_buffer (gtk_sink->widget, buf);
 
-  GST_OBJECT_UNLOCK (vsink);
+  GST_OBJECT_UNLOCK (gtk_sink);
 
   return GST_FLOW_OK;
 }

diff --git a/ext/gtk/gstgtksink.h b/ext/gtk/gstgtksink.h
index f7b6ba7..40eaa94 100644 (file)
--- a/ext/gtk/gstgtksink.h
+++ b/ext/gtk/gstgtksink.h
@@ -53,7 +53,7 @@ struct _GstGtkSink
 
   GstVideoInfo         v_info;
 
-  GtkGstWidget        *widget;
+  GtkGstBaseWidget     *widget;
 
   /* properties */
   gboolean             force_aspect_ratio;

diff --git a/ext/gtk/gtkgstwidget.c b/ext/gtk/gtkgstwidget.c
index 3fbb0ca..58326d7 100644 (file)
--- a/ext/gtk/gtkgstwidget.c
+++ b/ext/gtk/gtkgstwidget.c
@@ -37,80 +37,10 @@
 
 G_DEFINE_TYPE (GtkGstWidget, gtk_gst_widget, GTK_TYPE_DRAWING_AREA);
 
-#define GTK_GST_WIDGET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-    GTK_TYPE_GST_WIDGET, GtkGstWidgetPrivate))
-
-#define DEFAULT_FORCE_ASPECT_RATIO  TRUE
-#define DEFAULT_PAR_N               0
-#define DEFAULT_PAR_D               1
-#define DEFAULT_IGNORE_ALPHA        TRUE
-
-enum
-{
-  PROP_0,
-  PROP_FORCE_ASPECT_RATIO,
-  PROP_PIXEL_ASPECT_RATIO,
-  PROP_IGNORE_ALPHA,
-};
-
-struct _GtkGstWidgetPrivate
-{
-  GMutex lock;
-
-  /* properties */
-  gboolean force_aspect_ratio;
-  gint par_n, par_d;
-  gboolean ignore_alpha;
-
-  gint display_width;
-  gint display_height;
-
-  gboolean negotiated;
-  GstBuffer *buffer;
-  GstCaps *caps;
-  GstVideoInfo v_info;
-
-  /* Pending queued idles callback */
-  guint draw_id;
-  guint resize_id;
-};
-
-static void
-gtk_gst_widget_get_preferred_width (GtkWidget * widget, gint * min,
-    gint * natural)
-{
-  GtkGstWidget *gst_widget = (GtkGstWidget *) widget;
-  gint video_width = gst_widget->priv->display_width;
-
-  if (!gst_widget->priv->negotiated)
-    video_width = 10;
-
-  if (min)
-    *min = 1;
-  if (natural)
-    *natural = video_width;
-}
-
-static void
-gtk_gst_widget_get_preferred_height (GtkWidget * widget, gint * min,
-    gint * natural)
-{
-  GtkGstWidget *gst_widget = (GtkGstWidget *) widget;
-  gint video_height = gst_widget->priv->display_height;
-
-  if (!gst_widget->priv->negotiated)
-    video_height = 10;
-
-  if (min)
-    *min = 1;
-  if (natural)
-    *natural = video_height;
-}
-
 static gboolean
 gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
 {
-  GtkGstWidget *gst_widget = (GtkGstWidget *) widget;
+  GtkGstBaseWidget *gst_widget = (GtkGstBaseWidget *) widget;
   guint widget_width, widget_height;
   cairo_surface_t *surface;
   GstVideoFrame frame;
@@ -118,19 +48,18 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   widget_width = gtk_widget_get_allocated_width (widget);
   widget_height = gtk_widget_get_allocated_height (widget);
 
-  g_mutex_lock (&gst_widget->priv->lock);
+  GTK_GST_BASE_WIDGET_LOCK (gst_widget);
 
   /* failed to map the video frame */
-  if (gst_widget->priv->negotiated && gst_widget->priv->buffer
-      && gst_video_frame_map (&frame, &gst_widget->priv->v_info,
-          gst_widget->priv->buffer, GST_MAP_READ)) {
-    gdouble scale_x = (gdouble) widget_width / gst_widget->priv->display_width;
-    gdouble scale_y =
-        (gdouble) widget_height / gst_widget->priv->display_height;
+  if (gst_widget->negotiated && gst_widget->buffer
+      && gst_video_frame_map (&frame, &gst_widget->v_info,
+          gst_widget->buffer, GST_MAP_READ)) {
+    gdouble scale_x = (gdouble) widget_width / gst_widget->display_width;
+    gdouble scale_y = (gdouble) widget_height / gst_widget->display_height;
     GstVideoRectangle result;
     cairo_format_t format;
 
-    gst_widget->priv->v_info = frame.info;
+    gst_widget->v_info = frame.info;
     if (frame.info.finfo->format == GST_VIDEO_FORMAT_ARGB ||
         frame.info.finfo->format == GST_VIDEO_FORMAT_BGRA) {
       format = CAIRO_FORMAT_ARGB32;
@@ -141,13 +70,13 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
     surface = cairo_image_surface_create_for_data (frame.data[0],
         format, frame.info.width, frame.info.height, frame.info.stride[0]);
 
-    if (gst_widget->priv->force_aspect_ratio) {
+    if (gst_widget->force_aspect_ratio) {
       GstVideoRectangle src, dst;
 
       src.x = 0;
       src.y = 0;
-      src.w = gst_widget->priv->display_width;
-      src.h = gst_widget->priv->display_height;
+      src.w = gst_widget->display_width;
+      src.h = gst_widget->display_height;
 
       dst.x = 0;
       dst.y = 0;
@@ -164,7 +93,7 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       result.h = widget_height;
     }
 
-    if (gst_widget->priv->ignore_alpha) {
+    if (gst_widget->ignore_alpha) {
       GdkRGBA color = { 0.0, 0.0, 0.0, 1.0 };
 
       gdk_cairo_set_source_rgba (cr, &color);
@@ -188,11 +117,9 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       }
     }
 
-    scale_x *=
-        (gdouble) gst_widget->priv->display_width / (gdouble) frame.info.width;
+    scale_x *= (gdouble) gst_widget->display_width / (gdouble) frame.info.width;
     scale_y *=
-        (gdouble) gst_widget->priv->display_height /
-        (gdouble) frame.info.height;
+        (gdouble) gst_widget->display_height / (gdouble) frame.info.height;
 
     cairo_translate (cr, result.x, result.y);
     cairo_scale (cr, scale_x, scale_y);
@@ -206,7 +133,7 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   } else {
     GdkRGBA color;
 
-    if (gst_widget->priv->ignore_alpha) {
+    if (gst_widget->ignore_alpha) {
       color.red = color.blue = color.green = 0.0;
       color.alpha = 1.0;
     } else {
@@ -218,118 +145,33 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
     cairo_fill (cr);
   }
 
-  g_mutex_unlock (&gst_widget->priv->lock);
+  GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
   return FALSE;
 }
 
 static void
 gtk_gst_widget_finalize (GObject * object)
 {
-  GtkGstWidget *widget = GTK_GST_WIDGET_CAST (object);
-
-  gst_buffer_replace (&widget->priv->buffer, NULL);
-  g_mutex_clear (&widget->priv->lock);
-
-  if (widget->priv->draw_id)
-    g_source_remove (widget->priv->draw_id);
-
-  if (widget->priv->resize_id)
-    g_source_remove (widget->priv->resize_id);
+  gtk_gst_base_widget_finalize (object);
 
   G_OBJECT_CLASS (gtk_gst_widget_parent_class)->finalize (object);
 }
 
 static void
-gtk_gst_widget_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GtkGstWidget *gtk_widget = GTK_GST_WIDGET (object);
-
-  switch (prop_id) {
-    case PROP_FORCE_ASPECT_RATIO:
-      gtk_widget->priv->force_aspect_ratio = g_value_get_boolean (value);
-      break;
-    case PROP_PIXEL_ASPECT_RATIO:
-      gtk_widget->priv->par_n = gst_value_get_fraction_numerator (value);
-      gtk_widget->priv->par_d = gst_value_get_fraction_denominator (value);
-      break;
-    case PROP_IGNORE_ALPHA:
-      gtk_widget->priv->ignore_alpha = g_value_get_boolean (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gtk_gst_widget_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GtkGstWidget *gtk_widget = GTK_GST_WIDGET (object);
-
-  switch (prop_id) {
-    case PROP_FORCE_ASPECT_RATIO:
-      g_value_set_boolean (value, gtk_widget->priv->force_aspect_ratio);
-      break;
-    case PROP_PIXEL_ASPECT_RATIO:
-      gst_value_set_fraction (value, gtk_widget->priv->par_n,
-          gtk_widget->priv->par_d);
-      break;
-    case PROP_IGNORE_ALPHA:
-      g_value_set_boolean (value, gtk_widget->priv->ignore_alpha);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
 gtk_gst_widget_class_init (GtkGstWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
   GtkWidgetClass *widget_klass = (GtkWidgetClass *) klass;
 
-  g_type_class_add_private (klass, sizeof (GtkGstWidgetPrivate));
-
-  gobject_klass->set_property = gtk_gst_widget_set_property;
-  gobject_klass->get_property = gtk_gst_widget_get_property;
+  gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
   gobject_klass->finalize = gtk_gst_widget_finalize;
-
-  g_object_class_install_property (gobject_klass, PROP_FORCE_ASPECT_RATIO,
-      g_param_spec_boolean ("force-aspect-ratio",
-          "Force aspect ratio",
-          "When enabled, scaling will respect original aspect ratio",
-          DEFAULT_FORCE_ASPECT_RATIO,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_klass, PROP_PIXEL_ASPECT_RATIO,
-      gst_param_spec_fraction ("pixel-aspect-ratio", "Pixel Aspect Ratio",
-          "The pixel aspect ratio of the device", DEFAULT_PAR_N, DEFAULT_PAR_D,
-          G_MAXINT, 1, 1, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_klass, PROP_IGNORE_ALPHA,
-      g_param_spec_boolean ("ignore-alpha", "Ignore Alpha",
-          "When enabled, alpha will be ignored and converted to black",
-          DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
   widget_klass->draw = gtk_gst_widget_draw;
-  widget_klass->get_preferred_width = gtk_gst_widget_get_preferred_width;
-  widget_klass->get_preferred_height = gtk_gst_widget_get_preferred_height;
 }
 
 static void
 gtk_gst_widget_init (GtkGstWidget * widget)
 {
-  widget->priv = GTK_GST_WIDGET_GET_PRIVATE (widget);
-
-  widget->priv->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
-  widget->priv->par_n = DEFAULT_PAR_N;
-  widget->priv->par_d = DEFAULT_PAR_D;
-  widget->priv->ignore_alpha = DEFAULT_IGNORE_ALPHA;
-
-  g_mutex_init (&widget->priv->lock);
+  gtk_gst_base_widget_init (GTK_GST_BASE_WIDGET (widget));
 }
 
 GtkWidget *
@@ -337,153 +179,3 @@ gtk_gst_widget_new (void)
 {
   return (GtkWidget *) g_object_new (GTK_TYPE_GST_WIDGET, NULL);
 }
-
-static gboolean
-_queue_draw (GtkGstWidget * widget)
-{
-  g_mutex_lock (&widget->priv->lock);
-  widget->priv->draw_id = 0;
-  g_mutex_unlock (&widget->priv->lock);
-
-  gtk_widget_queue_draw (GTK_WIDGET (widget));
-
-  return G_SOURCE_REMOVE;
-}
-
-void
-gtk_gst_widget_set_buffer (GtkGstWidget * widget, GstBuffer * buffer)
-{
-  g_return_if_fail (GTK_IS_GST_WIDGET (widget));
-  g_return_if_fail (buffer == NULL || widget->priv->negotiated);
-
-  g_mutex_lock (&widget->priv->lock);
-
-  gst_buffer_replace (&widget->priv->buffer, buffer);
-
-  if (!widget->priv->draw_id) {
-    widget->priv->draw_id = g_idle_add_full (G_PRIORITY_DEFAULT,
-        (GSourceFunc) _queue_draw, widget, NULL);
-  }
-
-  g_mutex_unlock (&widget->priv->lock);
-}
-
-static gboolean
-_queue_resize (GtkGstWidget * widget)
-{
-  g_mutex_lock (&widget->priv->lock);
-  widget->priv->resize_id = 0;
-  g_mutex_unlock (&widget->priv->lock);
-
-  gtk_widget_queue_resize (GTK_WIDGET (widget));
-
-  return G_SOURCE_REMOVE;
-}
-
-static gboolean
-_calculate_par (GtkGstWidget * widget, GstVideoInfo * info)
-{
-  gboolean ok;
-  gint width, height;
-  gint par_n, par_d;
-  gint display_par_n, display_par_d;
-  guint display_ratio_num, display_ratio_den;
-
-  width = GST_VIDEO_INFO_WIDTH (info);
-  height = GST_VIDEO_INFO_HEIGHT (info);
-
-  par_n = GST_VIDEO_INFO_PAR_N (info);
-  par_d = GST_VIDEO_INFO_PAR_D (info);
-
-  if (!par_n)
-    par_n = 1;
-
-  /* get display's PAR */
-  if (widget->priv->par_n != 0 && widget->priv->par_d != 0) {
-    display_par_n = widget->priv->par_n;
-    display_par_d = widget->priv->par_d;
-  } else {
-    display_par_n = 1;
-    display_par_d = 1;
-  }
-
-  ok = gst_video_calculate_display_ratio (&display_ratio_num,
-      &display_ratio_den, width, height, par_n, par_d, display_par_n,
-      display_par_d);
-
-  if (!ok)
-    return FALSE;
-
-  GST_LOG ("PAR: %u/%u DAR:%u/%u", par_n, par_d, display_par_n, display_par_d);
-
-  if (height % display_ratio_den == 0) {
-    GST_DEBUG ("keeping video height");
-    widget->priv->display_width = (guint)
-        gst_util_uint64_scale_int (height, display_ratio_num,
-        display_ratio_den);
-    widget->priv->display_height = height;
-  } else if (width % display_ratio_num == 0) {
-    GST_DEBUG ("keeping video width");
-    widget->priv->display_width = width;
-    widget->priv->display_height = (guint)
-        gst_util_uint64_scale_int (width, display_ratio_den, display_ratio_num);
-  } else {
-    GST_DEBUG ("approximating while keeping video height");
-    widget->priv->display_width = (guint)
-        gst_util_uint64_scale_int (height, display_ratio_num,
-        display_ratio_den);
-    widget->priv->display_height = height;
-  }
-  GST_DEBUG ("scaling to %dx%d", widget->priv->display_width,
-      widget->priv->display_height);
-
-  return TRUE;
-}
-
-gboolean
-gtk_gst_widget_set_caps (GtkGstWidget * widget, GstCaps * caps)
-{
-  GstVideoInfo v_info;
-
-  g_return_val_if_fail (GTK_IS_GST_WIDGET (widget), FALSE);
-  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
-  g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE);
-
-  if (widget->priv->caps && gst_caps_is_equal_fixed (widget->priv->caps, caps))
-    return TRUE;
-
-  if (!gst_video_info_from_caps (&v_info, caps))
-    return FALSE;
-
-  /* FIXME: support other formats */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  g_return_val_if_fail (GST_VIDEO_INFO_FORMAT (&v_info) ==
-      GST_VIDEO_FORMAT_BGRA || GST_VIDEO_INFO_FORMAT (&v_info) ==
-      GST_VIDEO_FORMAT_BGRx, FALSE);
-#else
-  g_return_val_if_fail (GST_VIDEO_INFO_FORMAT (&v_info) ==
-      GST_VIDEO_FORMAT_ARGB || GST_VIDEO_INFO_FORMAT (&v_info) ==
-      GST_VIDEO_FORMAT_xRGB, FALSE);
-#endif
-
-  g_mutex_lock (&widget->priv->lock);
-
-  if (!_calculate_par (widget, &v_info)) {
-    g_mutex_unlock (&widget->priv->lock);
-    return FALSE;
-  }
-
-  gst_buffer_replace (&widget->priv->buffer, NULL);
-  gst_caps_replace (&widget->priv->caps, caps);
-  widget->priv->v_info = v_info;
-  widget->priv->negotiated = TRUE;
-
-  if (!widget->priv->resize_id) {
-    widget->priv->resize_id = g_idle_add_full (G_PRIORITY_DEFAULT,
-        (GSourceFunc) _queue_resize, widget, NULL);
-  }
-
-  g_mutex_unlock (&widget->priv->lock);
-
-  return TRUE;
-}

diff --git a/ext/gtk/gtkgstwidget.h b/ext/gtk/gtkgstwidget.h
index 29adaff..427eeba 100644 (file)
--- a/ext/gtk/gtkgstwidget.h
+++ b/ext/gtk/gtkgstwidget.h
@@ -24,6 +24,8 @@
 #include <gtk/gtk.h>
 #include <gst/gst.h>
 
+#include "gtkgstbasewidget.h"
+
 G_BEGIN_DECLS
 
 GType gtk_gst_widget_get_type (void);
@@ -36,7 +38,6 @@ GType gtk_gst_widget_get_type (void);
 
 typedef struct _GtkGstWidget GtkGstWidget;
 typedef struct _GtkGstWidgetClass GtkGstWidgetClass;
-typedef struct _GtkGstWidgetPrivate GtkGstWidgetPrivate;
 
 /**
  * GtkGstWidget:
@@ -46,9 +47,7 @@ typedef struct _GtkGstWidgetPrivate GtkGstWidgetPrivate;
 struct _GtkGstWidget
 {
   /* <private> */
-  GtkDrawingArea         parent;
-
-  GtkGstWidgetPrivate   *priv;
+  GtkGstBaseWidget base;
 };
 
 /**
@@ -59,14 +58,11 @@ struct _GtkGstWidget
 struct _GtkGstWidgetClass
 {
   /* <private> */
-  GtkDrawingAreaClass object_class;
+  GtkGstBaseWidgetClass base_class;
 };
 
 GtkWidget *     gtk_gst_widget_new (void);
 
-gboolean        gtk_gst_widget_set_caps             (GtkGstWidget * widget, GstCaps *caps);
-void            gtk_gst_widget_set_buffer           (GtkGstWidget * widget, GstBuffer *buffer);
-
 G_END_DECLS
 
 #endif /* __GTK_GST_WIDGET_H__ */