gstreamer1: Backport multiqueue: Add stats property

This commit is needed to correct the buffering percentage in WebKit on Nexus
systems, where playpump and multiqueue store a significant amount of data
and interfere with the queue2 buffering level (used to control pause for
rebuffering).

Author: eocanha

package/gstreamer1/gstreamer1/1.10.4/0006-multiqueue-Add-stats-property.patch

@@ -0,0 +1,108 @@
+From 147f30e1eeacd184e78154dbfe961b12627901b5 Mon Sep 17 00:00:00 2001
+From: Vivia Nikolaidou <[email protected]>
+Date: Thu, 9 Apr 2020 13:12:22 +0300
+Subject: [PATCH] multiqueue: Add stats property
+
+The returned "stats" structure contains, for now, one array called
+"queues" with one GstStructure per internal queue, containing said
+queue's current level of bytes, buffers, and time.
+---
+ plugins/elements/gstmultiqueue.c | 61 ++++++++++++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
+index d59acaa830..50780b9293 100644
+--- a/plugins/elements/gstmultiqueue.c
++++ b/plugins/elements/gstmultiqueue.c
+@@ -290,6 +290,7 @@ enum
+   PROP_SYNC_BY_RUNNING_TIME,
+   PROP_USE_INTERLEAVE,
+   PROP_UNLINKED_CACHE_TIME,
++  PROP_STATS,
+   PROP_LAST
+ };
+ 
+@@ -636,6 +637,25 @@ gst_multi_queue_class_init (GstMultiQueueClass * klass)
+           G_PARAM_STATIC_STRINGS));
+ 
+ 
++  /**
++   * GstMultiQueue:stats:
++   *
++   * Various #GstMultiQueue statistics. This property returns a #GstStructure
++   * with name "application/x-gst-multi-queue-stats" with the following fields:
++   *
++   * - "queues" GST_TYPE_ARRAY    Contains one GstStructure named "queue_%d"
++   *   (where %d is the queue's ID) per internal queue:
++   *   - "buffers" G_TYPE_UINT    The queue's current level of buffers
++   *   - "bytes" G_TYPE_UINT    The queue's current level of bytes
++   *   - "time" G_TYPE_UINT64    The queue's current level of time
++   *
++   * Since: 1.18
++   */
++  g_object_class_install_property (gobject_class, PROP_STATS,
++      g_param_spec_boxed ("stats", "Stats",
++          "Multiqueue Statistics",
++          GST_TYPE_STRUCTURE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
++
+   gobject_class->finalize = gst_multi_queue_finalize;
+ 
+   gst_element_class_set_static_metadata (gstelement_class,
+@@ -820,6 +840,44 @@ gst_multi_queue_set_property (GObject * object, guint prop_id,
+   }
+ }
+ 
++/* Called with mutex held */
++static GstStructure *
++gst_multi_queue_get_stats (GstMultiQueue * mq)
++{
++  GstStructure *ret =
++      gst_structure_new_empty ("application/x-gst-multi-queue-stats");
++  GList *tmp;
++  GstSingleQueue *sq;
++
++  if (mq->queues != NULL) {
++    GValue queues = G_VALUE_INIT;
++    GValue v = G_VALUE_INIT;
++
++    g_value_init (&queues, GST_TYPE_ARRAY);
++
++    for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) {
++      GstDataQueueSize level;
++      GstStructure *s;
++      gchar *id;
++      g_value_init (&v, GST_TYPE_STRUCTURE);
++
++      sq = (GstSingleQueue *) tmp->data;
++      gst_data_queue_get_level (sq->queue, &level);
++      id = g_strdup_printf ("queue_%d", sq->id);
++      s = gst_structure_new (id,
++          "buffers", G_TYPE_UINT, level.visible,
++          "bytes", G_TYPE_UINT, level.bytes,
++          "time", G_TYPE_UINT64, sq->cur_time, NULL);
++      g_value_take_boxed (&v, s);
++      gst_value_array_append_and_take_value (&queues, &v);
++      g_free (id);
++    }
++    gst_structure_take_value (ret, "queues", &queues);
++  }
++
++  return ret;
++}
++
+ static void
+ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     GValue * value, GParamSpec * pspec)
+@@ -873,6 +931,9 @@ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     case PROP_UNLINKED_CACHE_TIME:
+       g_value_set_uint64 (value, mq->unlinked_cache_time);
+       break;
++    case PROP_STATS:
++      g_value_take_boxed (value, gst_multi_queue_get_stats (mq));
++      break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+-- 
+2.17.1
+

package/gstreamer1/gstreamer1/1.14.4/0004-multiqueue-Add-stats-property.patch

@@ -0,0 +1,108 @@
+From 2300f9677a6bc434d01d27f4b5af5edf08bde374 Mon Sep 17 00:00:00 2001
+From: Vivia Nikolaidou <[email protected]>
+Date: Thu, 9 Apr 2020 13:12:22 +0300
+Subject: [PATCH] multiqueue: Add stats property
+
+The returned "stats" structure contains, for now, one array called
+"queues" with one GstStructure per internal queue, containing said
+queue's current level of bytes, buffers, and time.
+---
+ plugins/elements/gstmultiqueue.c | 61 ++++++++++++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
+index bcf8efa87a..90d057e5ee 100644
+--- a/plugins/elements/gstmultiqueue.c
++++ b/plugins/elements/gstmultiqueue.c
+@@ -273,6 +273,7 @@ enum
+   PROP_USE_INTERLEAVE,
+   PROP_UNLINKED_CACHE_TIME,
+   PROP_MINIMUM_INTERLEAVE,
++  PROP_STATS,
+   PROP_LAST
+ };
+ 
+@@ -625,6 +626,25 @@ gst_multi_queue_class_init (GstMultiQueueClass * klass)
+           G_PARAM_READWRITE | GST_PARAM_MUTABLE_PLAYING |
+           G_PARAM_STATIC_STRINGS));
+ 
++  /**
++   * GstMultiQueue:stats:
++   *
++   * Various #GstMultiQueue statistics. This property returns a #GstStructure
++   * with name "application/x-gst-multi-queue-stats" with the following fields:
++   *
++   * - "queues" GST_TYPE_ARRAY    Contains one GstStructure named "queue_%d"
++   *   (where %d is the queue's ID) per internal queue:
++   *   - "buffers" G_TYPE_UINT    The queue's current level of buffers
++   *   - "bytes" G_TYPE_UINT    The queue's current level of bytes
++   *   - "time" G_TYPE_UINT64    The queue's current level of time
++   *
++   * Since: 1.18
++   */
++  g_object_class_install_property (gobject_class, PROP_STATS,
++      g_param_spec_boxed ("stats", "Stats",
++          "Multiqueue Statistics",
++          GST_TYPE_STRUCTURE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
++
+   gobject_class->finalize = gst_multi_queue_finalize;
+ 
+   gst_element_class_set_static_metadata (gstelement_class,
+@@ -818,6 +838,44 @@ gst_multi_queue_set_property (GObject * object, guint prop_id,
+   }
+ }
+ 
++/* Called with mutex held */
++static GstStructure *
++gst_multi_queue_get_stats (GstMultiQueue * mq)
++{
++  GstStructure *ret =
++      gst_structure_new_empty ("application/x-gst-multi-queue-stats");
++  GList *tmp;
++  GstSingleQueue *sq;
++
++  if (mq->queues != NULL) {
++    GValue queues = G_VALUE_INIT;
++    GValue v = G_VALUE_INIT;
++
++    g_value_init (&queues, GST_TYPE_ARRAY);
++
++    for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) {
++      GstDataQueueSize level;
++      GstStructure *s;
++      gchar *id;
++      g_value_init (&v, GST_TYPE_STRUCTURE);
++
++      sq = (GstSingleQueue *) tmp->data;
++      gst_data_queue_get_level (sq->queue, &level);
++      id = g_strdup_printf ("queue_%d", sq->id);
++      s = gst_structure_new (id,
++          "buffers", G_TYPE_UINT, level.visible,
++          "bytes", G_TYPE_UINT, level.bytes,
++          "time", G_TYPE_UINT64, sq->cur_time, NULL);
++      g_value_take_boxed (&v, s);
++      gst_value_array_append_and_take_value (&queues, &v);
++      g_free (id);
++    }
++    gst_structure_take_value (ret, "queues", &queues);
++  }
++
++  return ret;
++}
++
+ static void
+ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     GValue * value, GParamSpec * pspec)
+@@ -874,6 +932,9 @@ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     case PROP_MINIMUM_INTERLEAVE:
+       g_value_set_uint64 (value, mq->min_interleave_time);
+       break;
++    case PROP_STATS:
++      g_value_take_boxed (value, gst_multi_queue_get_stats (mq));
++      break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+-- 
+2.17.1
+

package/gstreamer1/gstreamer1/1.16.2/0002-multiqueue-Add-stats-property.patch

@@ -0,0 +1,108 @@
+From b5b65fc99e4d13cb39cc4b6371b74f8998f39da4 Mon Sep 17 00:00:00 2001
+From: Vivia Nikolaidou <[email protected]>
+Date: Thu, 9 Apr 2020 13:12:22 +0300
+Subject: [PATCH 2/2] multiqueue: Add stats property
+
+The returned "stats" structure contains, for now, one array called
+"queues" with one GstStructure per internal queue, containing said
+queue's current level of bytes, buffers, and time.
+---
+ plugins/elements/gstmultiqueue.c | 61 ++++++++++++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
+index ea489013cc..aed1992c2b 100644
+--- a/plugins/elements/gstmultiqueue.c
++++ b/plugins/elements/gstmultiqueue.c
+@@ -273,6 +273,7 @@ enum
+   PROP_USE_INTERLEAVE,
+   PROP_UNLINKED_CACHE_TIME,
+   PROP_MINIMUM_INTERLEAVE,
++  PROP_STATS,
+   PROP_LAST
+ };
+ 
+@@ -625,6 +626,25 @@ gst_multi_queue_class_init (GstMultiQueueClass * klass)
+           G_PARAM_READWRITE | GST_PARAM_MUTABLE_PLAYING |
+           G_PARAM_STATIC_STRINGS));
+ 
++  /**
++   * GstMultiQueue:stats:
++   *
++   * Various #GstMultiQueue statistics. This property returns a #GstStructure
++   * with name "application/x-gst-multi-queue-stats" with the following fields:
++   *
++   * - "queues" GST_TYPE_ARRAY    Contains one GstStructure named "queue_%d"
++   *   (where %d is the queue's ID) per internal queue:
++   *   - "buffers" G_TYPE_UINT    The queue's current level of buffers
++   *   - "bytes" G_TYPE_UINT    The queue's current level of bytes
++   *   - "time" G_TYPE_UINT64    The queue's current level of time
++   *
++   * Since: 1.18
++   */
++  g_object_class_install_property (gobject_class, PROP_STATS,
++      g_param_spec_boxed ("stats", "Stats",
++          "Multiqueue Statistics",
++          GST_TYPE_STRUCTURE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
++
+   gobject_class->finalize = gst_multi_queue_finalize;
+ 
+   gst_element_class_set_static_metadata (gstelement_class,
+@@ -818,6 +838,44 @@ gst_multi_queue_set_property (GObject * object, guint prop_id,
+   }
+ }
+ 
++/* Called with mutex held */
++static GstStructure *
++gst_multi_queue_get_stats (GstMultiQueue * mq)
++{
++  GstStructure *ret =
++      gst_structure_new_empty ("application/x-gst-multi-queue-stats");
++  GList *tmp;
++  GstSingleQueue *sq;
++
++  if (mq->queues != NULL) {
++    GValue queues = G_VALUE_INIT;
++    GValue v = G_VALUE_INIT;
++
++    g_value_init (&queues, GST_TYPE_ARRAY);
++
++    for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) {
++      GstDataQueueSize level;
++      GstStructure *s;
++      gchar *id;
++      g_value_init (&v, GST_TYPE_STRUCTURE);
++
++      sq = (GstSingleQueue *) tmp->data;
++      gst_data_queue_get_level (sq->queue, &level);
++      id = g_strdup_printf ("queue_%d", sq->id);
++      s = gst_structure_new (id,
++          "buffers", G_TYPE_UINT, level.visible,
++          "bytes", G_TYPE_UINT, level.bytes,
++          "time", G_TYPE_UINT64, sq->cur_time, NULL);
++      g_value_take_boxed (&v, s);
++      gst_value_array_append_and_take_value (&queues, &v);
++      g_free (id);
++    }
++    gst_structure_take_value (ret, "queues", &queues);
++  }
++
++  return ret;
++}
++
+ static void
+ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     GValue * value, GParamSpec * pspec)
+@@ -874,6 +932,9 @@ gst_multi_queue_get_property (GObject * object, guint prop_id,
+     case PROP_MINIMUM_INTERLEAVE:
+       g_value_set_uint64 (value, mq->min_interleave_time);
+       break;
++    case PROP_STATS:
++      g_value_take_boxed (value, gst_multi_queue_get_stats (mq));
++      break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+-- 
+2.17.1
+