summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2014-03-13 01:20:52 +0000
committerRobert Bragg <robert.bragg@intel.com>2014-03-20 16:14:39 +0000
commitd36a9f6e1b5316595552a12c117d0e22a003dd84 (patch)
treeb98aee3eac8cf6f1c02d4758d65d7bce7d6dc385
parent87fbd95039f971eefc4bc7f0333c36d396ba82b6 (diff)
downloadcogl-d36a9f6e1b5316595552a12c117d0e22a003dd84.tar.gz
cogl-gst: add cogl_gst_video_sink_get_natural_size() api
This adds api for querying a "natural" width and height for a video which has the correct aspect ratio for displaying on square, 1:1 pixels. The natural size is the minimum size where downscaling is not required. Reviewed-by: Neil Roberts <neil@linux.intel.com>
-rw-r--r--cogl-gst/cogl-gst-video-sink.c48
-rw-r--r--cogl-gst/cogl-gst-video-sink.h71
2 files changed, 119 insertions, 0 deletions
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 418b76a7..42b50a9a 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -1658,6 +1658,54 @@ cogl_gst_video_sink_fit_size (CoglGstVideoSink *vt,
}
}
+void
+cogl_gst_video_sink_get_natural_size (CoglGstVideoSink *vt,
+ float *width,
+ float *height)
+{
+ GstVideoInfo *info;
+
+ g_return_val_if_fail (COGL_GST_IS_VIDEO_SINK (vt), 0.);
+
+ info = &vt->priv->info;
+
+ if (info->par_n > info->par_d)
+ {
+ /* To display the video at the right aspect ratio then in this
+ * case the pixels need to be stretched horizontally and so we
+ * use the unscaled height as our reference.
+ */
+
+ if (height)
+ *height = info->height;
+ if (width)
+ *width = cogl_gst_video_sink_get_width_for_height (vt, info->height);
+ }
+ else
+ {
+ if (width)
+ *width = info->width;
+ if (height)
+ *height = cogl_gst_video_sink_get_height_for_width (vt, info->width);
+ }
+}
+
+float
+cogl_gst_video_sink_get_natural_width (CoglGstVideoSink *vt)
+{
+ float width;
+ cogl_gst_video_sink_get_natural_size (vt, &width, NULL);
+ return width;
+}
+
+float
+cogl_gst_video_sink_get_natural_height (CoglGstVideoSink *vt)
+{
+ float height;
+ cogl_gst_video_sink_get_natural_size (vt, NULL, &height);
+ return height;
+}
+
CoglBool
cogl_gst_video_sink_is_ready (CoglGstVideoSink *sink)
{
diff --git a/cogl-gst/cogl-gst-video-sink.h b/cogl-gst/cogl-gst-video-sink.h
index 39e94a53..71718c2b 100644
--- a/cogl-gst/cogl-gst-video-sink.h
+++ b/cogl-gst/cogl-gst-video-sink.h
@@ -413,6 +413,77 @@ cogl_gst_video_sink_get_height_for_width (CoglGstVideoSink *sink,
float width);
/**
+ * cogl_gst_video_sink_get_natural_size:
+ * @sink: A #CoglGstVideoSink
+ * @width: (out): return location for the video's natural width
+ * @height: (out): return location for the video's natural height
+ *
+ * Considering the real resolution of the video as well as the aspect
+ * ratio of pixel data that may need to be stretched when being displayed;
+ * this function calculates what the natural size of the underlying
+ * video source is.
+ *
+ * The natural size has the correct aspect ratio for displaying the
+ * video and is the minimum size where downscaling is not required.
+ *
+ * <note>This natural size is calculated assuming that the video will
+ * be displayed on square pixels.</note>
+ *
+ * Since: 1.18
+ * Stability: unstable
+ */
+void
+cogl_gst_video_sink_get_natural_size (CoglGstVideoSink *sink,
+ float *width,
+ float *height);
+
+/**
+ * cogl_gst_video_sink_get_natural_width:
+ * @sink: A #CoglGstVideoSink
+ *
+ * Considering the real resolution of the video as well as the aspect
+ * ratio of pixel data that may need to be stretched when being displayed;
+ * this function calculates what the natural size of the underlying
+ * video source is, and returns its width.
+ *
+ * The natural size has the correct aspect ratio for displaying the
+ * video and is the minimum size where downscaling is not required.
+ *
+ * <note>This natural size is calculated assuming that the video will
+ * be displayed on square pixels.</note>
+ *
+ * Return value: The video's natural width
+ *
+ * Since: 1.18
+ * Stability: unstable
+ */
+float
+cogl_gst_video_sink_get_natural_width (CoglGstVideoSink *sink);
+
+/**
+ * cogl_gst_video_sink_get_natural_height:
+ * @sink: A #CoglGstVideoSink
+ *
+ * Considering the real resolution of the video as well as the aspect
+ * ratio of pixel data that may need to be stretched when being displayed;
+ * this function calculates what the natural size of the underlying
+ * video source is, and returns its height.
+ *
+ * The natural size has the correct aspect ratio for displaying the
+ * video and is the minimum size where downscaling is not required.
+ *
+ * <note>This natural size is calculated assuming that the video will
+ * be displayed on square pixels.</note>
+ *
+ * Return value: The video's natural height
+ *
+ * Since: 1.18
+ * Stability: unstable
+ */
+float
+cogl_gst_video_sink_get_natural_height (CoglGstVideoSink *sink);
+
+/**
* CoglGstRectangle:
* @x: The X coordinate of the top left of the rectangle
* @y: The Y coordinate of the top left of the rectangle