dvb: make interleaving a prop and proxy on dvbbasebin

DTV_INTERLEAVING is currently used only for DTBM. This is
congruent with the v4l dvb API where the different interleaving
modes where added for v5.7

sys/dvb/dvbbasebin.c

@@ -103,7 +103,8 @@ enum
   PROP_ISDBT_LAYERC_TIME_INTERLEAVING,
   PROP_LNB_SLOF,
   PROP_LNB_LOF1,
-  PROP_LNB_LOF2
+  PROP_LNB_LOF2,
+  PROP_INTERLEAVING
 };
 
 typedef struct
@@ -319,6 +320,7 @@ dvb_base_bin_class_init (DvbBaseBinClass * klass)
     {PROP_LNB_SLOF, "lnb-slof"},
     {PROP_LNB_LOF1, "lnb-lof1"},
     {PROP_LNB_LOF2, "lnb-lof2"},
+    {PROP_INTERLEAVING, "interleaving"},
     {0, NULL}
   };
 
@@ -650,6 +652,7 @@ dvb_base_bin_set_property (GObject * object, guint prop_id,
     case PROP_LNB_SLOF:
     case PROP_LNB_LOF1:
     case PROP_LNB_LOF2:
+    case PROP_INTERLEAVING:
       /* FIXME: check if we can tune (state < PLAYING || program-numbers == "") */
       g_object_set_property (G_OBJECT (dvbbasebin->dvbsrc), pspec->name, value);
       break;
@@ -710,6 +713,7 @@ dvb_base_bin_get_property (GObject * object, guint prop_id,
     case PROP_LNB_SLOF:
     case PROP_LNB_LOF1:
     case PROP_LNB_LOF2:
+    case PROP_INTERLEAVING:
       g_object_get_property (G_OBJECT (dvbbasebin->dvbsrc), pspec->name, value);
       break;
     case PROP_PROGRAM_NUMBERS:

sys/dvb/gstdvbsrc.c

@@ -194,7 +194,8 @@ enum
   ARG_DVBSRC_ISDBT_LAYERC_TIME_INTERLEAVING,
   ARG_DVBSRC_LNB_SLOF,
   ARG_DVBSRC_LNB_LOF1,
-  ARG_DVBSRC_LNB_LOF2
+  ARG_DVBSRC_LNB_LOF2,
+  ARG_DVBSRC_INTERLEAVING
 };
 
 #define DEFAULT_ADAPTER 0
@@ -243,6 +244,11 @@ enum
 #define DEFAULT_LNB_SLOF (11700*1000UL)
 #define DEFAULT_LNB_LOF1 (9750*1000UL)
 #define DEFAULT_LNB_LOF2 (10600*1000UL)
+#if HAVE_V5_MINOR(7)
+#define DEFAULT_INTERLEAVING INTERLEAVING_AUTO
+#else
+#define DEFAULT_INTERLEAVING 0
+#endif
 
 static void gst_dvbsrc_output_frontend_stats (GstDvbSrc * src);
 
@@ -501,6 +507,28 @@ gst_dvbsrc_rolloff_get_type (void)
   return dvbsrc_rolloff_type;
 }
 
+#define GST_TYPE_INTERLEAVING (gst_dvbsrc_interleaving_get_type ())
+static GType
+gst_dvbsrc_interleaving_get_type (void)
+{
+  static GType dvbsrc_interleaving_type = 0;
+  static GEnumValue interleaving_types[] = {
+#if HAVE_V5_MINOR(7)
+    {INTERLEAVING_NONE, "NONE", "none"},
+    {INTERLEAVING_AUTO, "AUTO", "auto"},
+    {INTERLEAVING_240, "240", "240"},
+    {INTERLEAVING_720, "720", "720"},
+#endif
+    {0, NULL, NULL},
+  };
+
+  if (!dvbsrc_interleaving_type) {
+    dvbsrc_interleaving_type =
+        g_enum_register_static ("GstDvbSrcInterleaving", interleaving_types);
+  }
+  return dvbsrc_interleaving_type;
+}
+
 static void gst_dvbsrc_finalize (GObject * object);
 static void gst_dvbsrc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -919,6 +947,15 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
           0, G_MAXUINT, DEFAULT_LNB_LOF2,
           GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE));
 
+  /* Additional DTMB properties */
+
+  g_object_class_install_property (gobject_class,
+      ARG_DVBSRC_INTERLEAVING,
+      g_param_spec_enum ("interleaving", "DTMB Interleaving",
+          "(DTMB) Interleaving type",
+          GST_TYPE_INTERLEAVING, DEFAULT_INTERLEAVING,
+          GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE));
+
   /**
    * GstDvbSrc::tuning-start:
    * @gstdvbsrc: the element on which the signal is emitted
@@ -1041,6 +1078,8 @@ gst_dvbsrc_init (GstDvbSrc * object)
   object->lnb_lof1 = DEFAULT_LNB_LOF1;
   object->lnb_lof2 = DEFAULT_LNB_LOF2;
 
+  object->interleaving = DEFAULT_INTERLEAVING;
+
   g_mutex_init (&object->tune_mutex);
   object->timeout = DEFAULT_TIMEOUT;
   object->tuning_timeout = DEFAULT_TUNING_TIMEOUT;
@@ -1283,6 +1322,9 @@ gst_dvbsrc_set_property (GObject * _object, guint prop_id,
     case ARG_DVBSRC_LNB_LOF2:
       object->lnb_lof2 = g_value_get_uint (value);
       break;
+    case ARG_DVBSRC_INTERLEAVING:
+      object->interleaving = g_value_get_enum (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -1446,6 +1488,9 @@ gst_dvbsrc_get_property (GObject * _object, guint prop_id,
     case ARG_DVBSRC_LNB_LOF2:
       g_value_set_uint (value, object->lnb_lof2);
       break;
+    case ARG_DVBSRC_INTERLEAVING:
+      g_value_set_enum (value, object->interleaving);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -2446,8 +2491,8 @@ gst_dvbsrc_set_fe_params (GstDvbSrc * object, struct dtv_properties *props)
       set_prop (props->props, &n, DTV_TRANSMISSION_MODE,
           object->transmission_mode);
       set_prop (props->props, &n, DTV_GUARD_INTERVAL, object->guard_interval);
-      /* FIXME: Make these properties and proxy them on dvbbasebin */
+      set_prop (props->props, &n, DTV_INTERLEAVING, object->interleaving);
-      set_prop (props->props, &n, DTV_INTERLEAVING, INTERLEAVING_AUTO);
+      /* FIXME: Make the LNA on/off switch a property and proxy on dvbbasebin */
       set_prop (props->props, &n, DTV_LNA, LNA_AUTO);
       GST_INFO_OBJECT (object, "Tuning DTMB to %d Hz", freq);
       break;

sys/dvb/gstdvbsrc.h

@@ -127,6 +127,9 @@ struct _GstDvbSrc
   unsigned int lnb_slof;
   unsigned int lnb_lof1;
   unsigned int lnb_lof2;
+
+  /* Only used for DTMB if available */
+  int interleaving;
 };
 
 struct _GstDvbSrcClass