From 572c9154dbbb0442a814fc04b35a14f5b24df1c7 Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Sat, 8 Oct 2016 05:20:47 -0700 Subject: [PATCH] dvb/parsechannels: parse DVB-T hierarchy from v5 config file Avoids relying on the H/W default when the information can be extracted from the configuration file. --- sys/dvb/parsechannels.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c index 29e2a645a0..0936621b3d 100644 --- a/sys/dvb/parsechannels.c +++ b/sys/dvb/parsechannels.c @@ -235,6 +235,18 @@ gst_dvb_base_bin_conf_set_delsys (GstElement * dvbbasebin, property, kf, channel_name, key, delsys, 0); } +static gboolean +gst_dvb_base_bin_conf_set_hierarchy (GstElement * dvbbasebin, + const gchar * property, GKeyFile * kf, const gchar * channel_name, + const gchar * key) +{ + const gchar *hierarchies[] = { + "NONE", "1", "2", "4", "AUTO", NULL + }; + return gst_dvb_base_bin_conf_set_property_from_string_array (dvbbasebin, + property, kf, channel_name, key, hierarchies, 4); +} + static gboolean gst_dvb_base_bin_conf_set_modulation (GstElement * dvbbasebin, const gchar * property, GKeyFile * kf, const gchar * channel_name, @@ -264,6 +276,7 @@ GstDvbV5ChannelsConfToPropertyMap dvbv5_prop_map[] = { {"INVERSION", "inversion", gst_dvb_base_bin_conf_set_inversion}, {"GUARD_INTERVAL", "guard", gst_dvb_base_bin_conf_set_guard}, {"TRANSMISSION_MODE", "trans-mode", gst_dvb_base_bin_conf_set_trans_mode}, + {"HIERARCHY", "hierarchy", gst_dvb_base_bin_conf_set_hierarchy}, {"MODULATION", "modulation", gst_dvb_base_bin_conf_set_modulation}, {"CODE_RATE_HP", "code-rate-hp", gst_dvb_base_bin_conf_set_code_rate}, {"CODE_RATE_LP", "code-rate-lp", gst_dvb_base_bin_conf_set_code_rate},