From 1491d02c4e78bc1321778fe67ceac7ea46b6befa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sat, 14 Nov 2015 20:21:17 +0000
Subject: [PATCH] adaptivedemux: remove now-defunct "num-lookback-fragments"
 property

This no longer does anything, and it was marked as CONSTRUCT_ONLY
which means someone would really have to go out of their way to
be able to set this, which would only be done in very custom
scenarios, if ever, and those will likely target a specific
version of GStreamer then, so probably not much point keeping
it deprecated for a while before removing it.
---
 gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 16 ----------------
 gst-libs/gst/adaptivedemux/gstadaptivedemux.h |  1 -
 tests/check/elements/dash_demux.c             |  3 ---
 3 files changed, 20 deletions(-)

diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
index 5c3e189c2b..87bebf1ca3 100644
--- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
+++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
@@ -132,7 +132,6 @@ GST_DEBUG_CATEGORY (adaptivedemux_debug);
 
 #define MAX_DOWNLOAD_ERROR_COUNT 3
 #define DEFAULT_FAILED_COUNT 3
-#define DEFAULT_LOOKBACK_FRAGMENTS 3
 #define DEFAULT_CONNECTION_SPEED 0
 #define DEFAULT_BITRATE_LIMIT 0.8
 #define SRC_QUEUE_MAX_BYTES 20 * 1024 * 1024    /* For safety. Large enough to hold a segment. */
@@ -148,7 +147,6 @@ GST_DEBUG_CATEGORY (adaptivedemux_debug);
 enum
 {
   PROP_0,
-  PROP_LOOKBACK_FRAGMENTS,
   PROP_CONNECTION_SPEED,
   PROP_BITRATE_LIMIT,
   PROP_LAST
@@ -301,9 +299,6 @@ gst_adaptive_demux_set_property (GObject * object, guint prop_id,
   GST_MANIFEST_LOCK (demux);
 
   switch (prop_id) {
-    case PROP_LOOKBACK_FRAGMENTS:
-      demux->num_lookback_fragments = g_value_get_uint (value);
-      break;
     case PROP_CONNECTION_SPEED:
       demux->connection_speed = g_value_get_uint (value) * 1000;
       GST_DEBUG_OBJECT (demux, "Connection speed set to %u",
@@ -330,9 +325,6 @@ gst_adaptive_demux_get_property (GObject * object, guint prop_id,
   GST_MANIFEST_LOCK (demux);
 
   switch (prop_id) {
-    case PROP_LOOKBACK_FRAGMENTS:
-      g_value_set_uint (value, demux->num_lookback_fragments);
-      break;
     case PROP_CONNECTION_SPEED:
       g_value_set_uint (value, demux->connection_speed / 1000);
       break;
@@ -368,13 +360,6 @@ gst_adaptive_demux_class_init (GstAdaptiveDemuxClass * klass)
   gobject_class->get_property = gst_adaptive_demux_get_property;
   gobject_class->finalize = gst_adaptive_demux_finalize;
 
-  g_object_class_install_property (gobject_class, PROP_LOOKBACK_FRAGMENTS,
-      g_param_spec_uint ("num-lookback-fragments",
-          "Number of fragments to look back",
-          "The number of fragments the demuxer will look back to calculate an average bitrate",
-          1, G_MAXUINT, DEFAULT_LOOKBACK_FRAGMENTS,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
-
   g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED,
       g_param_spec_uint ("connection-speed", "Connection Speed",
           "Network connection speed in kbps (0 = calculate from downloaded"
@@ -442,7 +427,6 @@ gst_adaptive_demux_init (GstAdaptiveDemux * demux,
       GST_DEBUG_FUNCPTR (gst_adaptive_demux_sink_chain));
 
   /* Properties */
-  demux->num_lookback_fragments = DEFAULT_LOOKBACK_FRAGMENTS;
   demux->bitrate_limit = DEFAULT_BITRATE_LIMIT;
   demux->connection_speed = DEFAULT_CONNECTION_SPEED;
 
diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
index bfc42a0226..566b29ab0a 100644
--- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
+++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
@@ -186,7 +186,6 @@ struct _GstAdaptiveDemux
   gchar *manifest_base_uri;
 
   /* Properties */
-  guint num_lookback_fragments;
   gfloat bitrate_limit;         /* limit of the available bitrate to use */
   guint connection_speed;
 
diff --git a/tests/check/elements/dash_demux.c b/tests/check/elements/dash_demux.c
index b83e2f20f8..01cc14200a 100644
--- a/tests/check/elements/dash_demux.c
+++ b/tests/check/elements/dash_demux.c
@@ -913,9 +913,6 @@ setAndTestDashParams (GstDashDemuxTestData * testData)
 {
   GstElement *dashdemux = testData->scratchData->dashdemux;
 
-  /* num-lookback-fragments can only be set at construction */
-  test_invalid_int_prop (G_OBJECT (dashdemux), "num-lookback-fragments", 10);
-
   test_int_prop (G_OBJECT (dashdemux), "connection-speed", 1000);
   test_invalid_int_prop (G_OBJECT (dashdemux), "connection-speed", 4294967 + 1);