File _service:tar_git:0014-camerabin-Take-account-sensor-mode-aspect-ratio-when.patch of Package gst-plugins-bad-free

From 896179f1b99c08a71b0fbac0611bb4b1074e91a2 Mon Sep 17 00:00:00 2001
From: Lasse Laukkanen <ext-lasse.2.laukkanen@nokia.com>
Date: Mon, 9 Aug 2010 15:54:49 +0300
Subject: [PATCH 14/23] camerabin: Take account sensor mode aspect ratio when
 selecting best framerate (meego specific)

If application does not explicitly set framerate, camerabin chooses
best framerate it can find for the resolution, usually the highest framerate.
This patch eliminates choosing framerates which correspond to sensor mode that
has different aspect ratio than the resolution application requested.
---
 gst/camerabin/gstcamerabin.c |   91 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 2 deletions(-)

diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index 492373e..2adfd5d 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -414,6 +414,9 @@ static void
 gst_camerabin_set_image_resolution (GstCameraBin * camera, gint width,
     gint height);
 
+static void
+gst_camerabin_filter_aspect_ratios_from_caps (GstCameraBin * camera,
+    gdouble target_ar, GstCaps * caps);
 
 /*
  * GST BOILERPLATE and GObject types
@@ -2280,6 +2283,8 @@ gst_camerabin_set_allowed_framerate (GstCameraBin * camera,
   const GValue *framerate = NULL;
   guint caps_size, i;
   guint32 format = 0;
+  gint w = 0, h = 0;
+  gdouble requested_ar = 0.0;
 
   GST_INFO_OBJECT (camera, "filter caps:%" GST_PTR_FORMAT, filter_caps);
 
@@ -2297,10 +2302,25 @@ gst_camerabin_set_allowed_framerate (GstCameraBin * camera,
     gst_structure_remove_field (structure, "format");
   }
 
+  /* Get supported caps from video source */
+  allowed_caps = gst_camerabin_get_allowed_input_caps (camera);
+
+  /* Subdevsrc supports width and height ranges for each frame rate.
+     Range max values and the frame rate in each gst structure essentially
+     define one sensor mode in the driver. For optimal use we need to use
+     sensor mode that has aspect ratio matching the requested resolution. */
+  gst_structure_get_int (structure, "width", &w);
+  gst_structure_get_int (structure, "height", &h);
+  if (w && h) {
+    requested_ar = (gdouble) w / h;
+  }
+  GST_LOG_OBJECT (camera, "aspect ratio of requested resolution (%dx%d): %lf",
+      w, h, requested_ar);
+  gst_camerabin_filter_aspect_ratios_from_caps (camera, requested_ar,
+      allowed_caps);
+
   tmp_caps = gst_caps_new_full (structure, NULL);
 
-  /* Get supported caps from video src that matches with new filter caps */
-  allowed_caps = gst_camerabin_get_allowed_input_caps (camera);
   intersect = gst_caps_intersect (allowed_caps, tmp_caps);
   GST_INFO_OBJECT (camera, "intersect caps:%" GST_PTR_FORMAT, intersect);
 
@@ -4449,6 +4469,73 @@ gst_camerabin_set_image_resolution (GstCameraBin * camera, gint width,
   }
 }
 
+#define CAMERABIN_ASPECT_RATIO_REMOVE_THRESHOLD 0.2
+
+/*
+ * gst_camerabin_filter_aspect_ratios_from_caps:
+ * @camera: camerabin object
+ * @target_ar: aspect ratio of the requested video
+ * @caps: caps describing all supported formats
+ *
+ * If video source provides supported resolutions in @caps as ranges,
+ * then use range maximum values as the aspect ratio of each structure.
+ *
+ * Then remove structures from @caps that don't have aspect ratio
+ * that matches with @target_ar.
+ */
+static void
+gst_camerabin_filter_aspect_ratios_from_caps (GstCameraBin * camera,
+    gdouble target_ar, GstCaps * caps)
+{
+  guint i, caps_size;
+  gint w_max = 0, h_max = 0;
+  GstStructure *st;
+  const GValue *dimension;
+  gdouble structure_ar = 0.0;
+
+  GST_DEBUG_OBJECT (camera,
+      "filtering aspect ratio %lf from: %" GST_PTR_FORMAT "", target_ar, caps);
+
+  /* Remove structures that don't match with target aspect ratio */
+  caps_size = gst_caps_get_size (caps);
+  for (i = 0; i < caps_size; i++) {
+    st = gst_caps_get_structure (caps, i);
+
+    GST_LOG_OBJECT (camera, "structure: %" GST_PTR_FORMAT, st);
+
+    /* If supported caps have width/height ranges specified, use the
+       range maximum values for aspect ratio. */
+    if (gst_structure_has_field_typed (st, "width", GST_TYPE_INT_RANGE)) {
+      dimension = gst_structure_get_value (st, "width");
+      w_max = gst_value_get_int_range_max (dimension);
+    }
+
+    if (gst_structure_has_field_typed (st, "height", GST_TYPE_INT_RANGE)) {
+      dimension = gst_structure_get_value (st, "height");
+      h_max = gst_value_get_int_range_max (dimension);
+    }
+
+    if (w_max && h_max) {
+      structure_ar = (gdouble) w_max / h_max;
+
+      GST_LOG_OBJECT (camera, "aspect ratios: target %lf - structure %lf",
+          target_ar, structure_ar);
+
+      if (ABS (target_ar - structure_ar) >
+          CAMERABIN_ASPECT_RATIO_REMOVE_THRESHOLD) {
+        /* Aspect ratio of the structure differs too much from the target, removing the structure */
+        GST_LOG_OBJECT (camera, "removing structure %" GST_PTR_FORMAT, st);
+        gst_caps_remove_structure (caps, i);
+        /* Current structure was removed and size of caps changed */
+        i--;
+        caps_size--;
+      }
+    }
+    w_max = 0;
+    h_max = 0;
+  }
+}
+
 /* entry point to initialize the plug-in
  * initialize the plug-in itself
  * register the element factories and pad templates
-- 
1.7.10.4