gst-libs/gst/video/: Add helper function needed for video sinks.

Original commit message from CVS:
2005-11-16  Julien MOUTTE  <julien@moutte.net>

* gst-libs/gst/video/gstvideosink.c:
(gst_video_sink_center_rect):
* gst-libs/gst/video/videosink.h: Add helper function needed
for video sinks.

diff --git a/ChangeLog b/ChangeLog
index 727d3be269b90e21afd718330848a8031d752098..9284212bb1972bcc4219e952cc96b2c6422e427f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-16  Julien MOUTTE  <julien@moutte.net>
+
+       * gst-libs/gst/video/gstvideosink.c: (gst_video_sink_center_rect):
+       * gst-libs/gst/video/videosink.h: Add helper function needed
+       for video sinks.
+
 2005-11-16  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/videoscale/gstvideoscale.c:

diff --git a/gst-libs/gst/video/gstvideosink.c b/gst-libs/gst/video/gstvideosink.c
index fc0009e589e72dec1de48601e2af30f2495d9b00..e716951b7cab886778f4ab7f8f62cbbaae9d4b03 100644 (file)
--- a/gst-libs/gst/video/gstvideosink.c
+++ b/gst-libs/gst/video/gstvideosink.c
@@ -27,6 +27,45 @@
 
 static GstElementClass *parent_class = NULL;
 
+void
+gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
+    GstVideoRectangle * result, gboolean scaling)
+{
+  g_return_if_fail (result != NULL);
+
+  if (!scaling) {
+    result->w = MIN (src.w, dst.w);
+    result->h = MIN (src.h, dst.h);
+    result->x = (dst.w - result->w) / 2;
+    result->y = (dst.h - result->h) / 2;
+  } else {
+    gdouble src_ratio, dst_ratio;
+
+    src_ratio = (gdouble) src.w / src.h;
+    dst_ratio = (gdouble) dst.w / dst.h;
+
+    if (src_ratio > dst_ratio) {
+      result->w = dst.w;
+      result->h = dst.w / src_ratio;
+      result->x = 0;
+      result->y = (dst.h - result->h) / 2;
+    } else if (src_ratio < dst_ratio) {
+      result->w = dst.h * src_ratio;
+      result->h = dst.h;
+      result->x = (dst.w - result->w) / 2;
+      result->y = 0;
+    } else {
+      result->x = 0;
+      result->y = 0;
+      result->w = dst.w;
+      result->h = dst.h;
+    }
+  }
+
+  GST_DEBUG ("source is %dx%d dest is %dx%d, result is %dx%d with x,y %dx%d",
+      src.w, src.h, dst.w, dst.h, result->w, result->h, result->x, result->y);
+}
+
 /* Initing stuff */
 
 static void

diff --git a/gst-libs/gst/video/gstvideosink.h b/gst-libs/gst/video/gstvideosink.h
index 6a73f8756850be7daa037ee79dca8889c4955811..49f5522d33462fd96fccddd84bd7a9619921500d 100644 (file)
--- a/gst-libs/gst/video/gstvideosink.h
+++ b/gst-libs/gst/video/gstvideosink.h
@@ -46,6 +46,14 @@ G_BEGIN_DECLS
   
 typedef struct _GstVideoSink GstVideoSink;
 typedef struct _GstVideoSinkClass GstVideoSinkClass;
+typedef struct _GstVideoRectangle GstVideoRectangle;
+
+struct _GstVideoRectangle {
+  gint x;
+  gint y;
+  gint w;
+  gint h;
+};
 
 struct _GstVideoSink {
   GstBaseSink element;
@@ -63,6 +71,9 @@ struct _GstVideoSinkClass {
 
 GType gst_video_sink_get_type (void);
 
+void gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
+                                 GstVideoRectangle *result, gboolean scaling);
+
 G_END_DECLS
 
 #endif  /* __GST_VIDEO_SINK_H__ */

diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h
index 6a73f8756850be7daa037ee79dca8889c4955811..49f5522d33462fd96fccddd84bd7a9619921500d 100644 (file)
--- a/gst-libs/gst/video/videosink.h
+++ b/gst-libs/gst/video/videosink.h
@@ -46,6 +46,14 @@ G_BEGIN_DECLS
   
 typedef struct _GstVideoSink GstVideoSink;
 typedef struct _GstVideoSinkClass GstVideoSinkClass;
+typedef struct _GstVideoRectangle GstVideoRectangle;
+
+struct _GstVideoRectangle {
+  gint x;
+  gint y;
+  gint w;
+  gint h;
+};
 
 struct _GstVideoSink {
   GstBaseSink element;
@@ -63,6 +71,9 @@ struct _GstVideoSinkClass {
 
 GType gst_video_sink_get_type (void);
 
+void gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
+                                 GstVideoRectangle *result, gboolean scaling);
+
 G_END_DECLS
 
 #endif  /* __GST_VIDEO_SINK_H__ */