Merge lp:~alfonsosanchezbeato/media-hub/get-dim-from-caps into lp:media-hub

[Alfonso Sanchez-Beato]

Use caps instead of custom properties to retrieve video dimensions

Use caps instead of custom properties to retrieve video dimensions

[Jim Hodapp (jhodapp)]

Were you able to test this on the phone as well?

Some changes needed inline below.

review: Needs Fixing (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See below, repushing too.

[lp:~alfonsosanchezbeato/media-hub/get-dim-from-caps]

215. By Alfonso Sanchez-Beato on 2017-02-27

Add const to GstStructure

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Tested on Meizu Pro 5 and for desktop, works as expected in both cases.

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2017-02-16 10:16:46 +0000
+++ src/core/media/gstreamer/playbin.cpp	2017-02-27 16:02:35 +0000
@@ -702,9 +702,27 @@
         };
 
     // Initialize to default value prior to querying actual values from the sink.
-    uint32_t video_width = 0, video_height = 0;
-    g_object_get (video_sink, "height", &video_height, nullptr);
-    g_object_get (video_sink, "width", &video_width, nullptr);
+    int video_width = 0, video_height = 0;
+
+    // There should be only one pad actually
+    GstIterator *iter = gst_element_iterate_pads(video_sink);
+    for (GValue item{};
+         gst_iterator_next(iter, &item) == GST_ITERATOR_OK;
+         g_value_unset(&item))
+    {
+        GstPad *pad = GST_PAD(g_value_get_object(&item));
+        GstCaps *caps = gst_pad_get_current_caps(pad);
+
+        if (caps) {
+            const GstStructure *s = gst_caps_get_structure(caps, 0);
+            gst_structure_get_int(s, "width", &video_width);
+            gst_structure_get_int(s, "height", &video_height);
+            MH_DEBUG("Video dimensions are %d x %d", video_width, video_height);
+
+            gst_caps_unref(caps);
+        }
+    }
+    gst_iterator_free(iter);
 
     // TODO(tvoss): We should probably check here if width and height are valid.
     return core::ubuntu::media::video::Dimensions