[PATCH 2/2] Patch: add dvb-s2, dvb-t2
linuxtv at stefanringel.de
linuxtv at stefanringel.de
Tue Oct 8 21:15:48 CEST 2013
From: Stefan Ringel <linuxtv at stefanringel.de>
Signed-off-by: Stefan Ringel <linuxtv at stefanringel.de>
---
sys/dvb/dvbbasebin.c | 13 ++++++
sys/dvb/gstdvbsrc.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++-----
sys/dvb/gstdvbsrc.h | 3 ++
3 files changed, 123 insertions(+), 10 deletions(-)
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index 2744f29..1900b14 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -72,6 +72,10 @@ enum
PROP_PROGRAM_NUMBERS,
PROP_STATS_REPORTING_INTERVAL,
PROP_DELSYS,
+ PROP_PILOT,
+ PROP_ROLLOFF,
+ PROP_STREAM_ID
+ /* FILL ME */
};
typedef struct
@@ -215,6 +219,9 @@ dvb_base_bin_class_init (DvbBaseBinClass * klass)
{PROP_INVERSION, "inversion"},
{PROP_STATS_REPORTING_INTERVAL, "stats-reporting-interval"},
{PROP_DELSYS, "delsys"},
+ {PROP_PILOT, "pilot"},
+ {PROP_ROLLOFF, "rolloff"},
+ {PROP_STREAM_ID, "stream-id"},
{0, NULL}
};
@@ -455,6 +462,9 @@ dvb_base_bin_set_property (GObject * object, guint prop_id,
case PROP_INVERSION:
case PROP_STATS_REPORTING_INTERVAL:
case PROP_DELSYS:
+ case PROP_PILOT:
+ case PROP_ROLLOFF:
+ case PROP_STREAM_ID:
/* FIXME: check if we can tune (state < PLAYING || program-numbers == "") */
g_object_set_property (G_OBJECT (dvbbasebin->dvbsrc), pspec->name, value);
break;
@@ -489,6 +499,9 @@ dvb_base_bin_get_property (GObject * object, guint prop_id,
case PROP_INVERSION:
case PROP_STATS_REPORTING_INTERVAL:
case PROP_DELSYS:
+ case PROP_PILOT:
+ case PROP_ROLLOFF:
+ case PROP_STREAM_ID:
g_object_get_property (G_OBJECT (dvbbasebin->dvbsrc), pspec->name, value);
break;
case PROP_PROGRAM_NUMBERS:
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index 6b2ea1e..b0efc43 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -93,6 +93,9 @@ enum
ARG_DVBSRC_TIMEOUT,
ARG_DVBSRC_DVB_BUFFER_SIZE,
ARG_DVBSRC_DELSYS,
+ ARG_DVBSRC_PILOT,
+ ARG_DVBSRC_ROLLOFF,
+ ARG_DVBSRC_STREAM_ID
};
#define DEFAULT_ADAPTER 0
@@ -115,6 +118,9 @@ enum
#define DEFAULT_DVB_BUFFER_SIZE (10*188*1024) /* Default is the same as the kernel default */
#define DEFAULT_BUFFER_SIZE 8192 /* not a property */
#define DEFAULT_DELSYS 0
+#define DEFAULT_PILOT PILOT_AUTO
+#define DEFAULT_ROLLOFF ROLLOFF_AUTO
+#define DEFAULT_STREAM_ID NO_STREAM_ID_FILTER
static void gst_dvbsrc_output_frontend_stats (GstDvbSrc * src);
@@ -305,6 +311,44 @@ gst_dvbsrc_delsys_get_type (void)
return dvbsrc_delsys_type;
}
+#define GST_TYPE_DVBSRC_PILOT (gst_dvbsrc_pilot_get_type ())
+static GType
+gst_dvbsrc_pilot_get_type (void)
+{
+ static GType dvbsrc_pilot_type = 0;
+ static GEnumValue pilot_types[] = {
+ {PILOT_ON, "ON", "on"},
+ {PILOT_OFF, "OFF", "off"},
+ {PILOT_AUTO, "AUTO", "auto"},
+ {0, NULL, NULL},
+ };
+
+ if (!dvbsrc_pilot_type) {
+ dvbsrc_pilot_type = g_enum_register_static ("GstDvbSrcPilot", pilot_types);
+ }
+ return dvbsrc_pilot_type;
+}
+
+#define GST_TYPE_DVBSRC_ROLLOFF (gst_dvbsrc_rolloff_get_type ())
+static GType
+gst_dvbsrc_rolloff_get_type (void)
+{
+ static GType dvbsrc_rolloff_type = 0;
+ static GEnumValue rolloff_types[] = {
+ {ROLLOFF_35, "35", "35"},
+ {ROLLOFF_20, "20", "20"},
+ {ROLLOFF_25, "25", "25"},
+ {ROLLOFF_AUTO, "auto", "auto"},
+ {0, NULL, NULL},
+ };
+
+ if (!dvbsrc_rolloff_type) {
+ dvbsrc_rolloff_type =
+ g_enum_register_static ("GstDvbSrcRolloff", rolloff_types);
+ }
+ return dvbsrc_rolloff_type;
+}
+
static void gst_dvbsrc_finalize (GObject * object);
static void gst_dvbsrc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
@@ -402,8 +446,9 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
0, G_MAXUINT, DEFAULT_FREQUENCY, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, ARG_DVBSRC_POLARITY,
- g_param_spec_string ("polarity", "polarity", "Polarity [vhHV] (DVB-S)",
- DEFAULT_POLARITY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ g_param_spec_string ("polarity", "polarity",
+ "Polarity [vhHV] (DVB-S, DVB-S2)", DEFAULT_POLARITY,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class, ARG_DVBSRC_PIDS,
g_param_spec_string ("pids", "pids",
@@ -413,7 +458,7 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
g_object_class_install_property (gobject_class, ARG_DVBSRC_SYM_RATE,
g_param_spec_uint ("symbol-rate",
"symbol rate",
- "Symbol Rate (DVB-S, DVB-C)",
+ "Symbol Rate (DVB-S, DVB-S2, DVB-C)",
0, G_MAXUINT, DEFAULT_SYMBOL_RATE, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, ARG_DVBSRC_TUNE,
@@ -423,7 +468,7 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
g_object_class_install_property (gobject_class, ARG_DVBSRC_DISEQC_SRC,
g_param_spec_int ("diseqc-source",
"diseqc source",
- "DISEqC selected source (-1 disabled) (DVB-S)",
+ "DISEqC selected source (-1 disabled) (DVB-S, DVB-S2)",
-1, 7, DEFAULT_DISEQC_SRC, G_PARAM_READWRITE));
/* DVB-T, additional properties */
@@ -433,11 +478,11 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
"bandwidth",
"Bandwidth (DVB-T)", GST_TYPE_DVBSRC_BANDWIDTH, DEFAULT_BANDWIDTH,
G_PARAM_READWRITE));
-
+ /* FIXME: DVB-C, DVB-S, DVB-S2 named it as innerFEC */
g_object_class_install_property (gobject_class, ARG_DVBSRC_CODE_RATE_HP,
g_param_spec_enum ("code-rate-hp",
"code-rate-hp",
- "High Priority Code Rate (DVB-T, DVB-S and DVB-C)",
+ "High Priority Code Rate (DVB-T, DVB-S, DVB-S2 and DVB-C)",
GST_TYPE_DVBSRC_CODE_RATE, DEFAULT_CODE_RATE_HP, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, ARG_DVBSRC_CODE_RATE_LP,
@@ -497,6 +542,19 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
g_object_class_install_property (gobject_class, ARG_DVBSRC_DELSYS,
g_param_spec_enum ("delsys", "delsys", "Delivery System",
GST_TYPE_DVBSRC_DELSYS, DEFAULT_DELSYS, G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class, ARG_DVBSRC_PILOT,
+ g_param_spec_enum ("pilot", "pilot", "Pilot (DVB-S2)",
+ GST_TYPE_DVBSRC_PILOT, DEFAULT_PILOT, G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class, ARG_DVBSRC_ROLLOFF,
+ g_param_spec_enum ("rolloff", "rolloff", "Rolloff (DVB-S2)",
+ GST_TYPE_DVBSRC_ROLLOFF, DEFAULT_ROLLOFF, G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class, ARG_DVBSRC_STREAM_ID,
+ g_param_spec_int ("stream-id", "stream-id",
+ "Stream ID (DVB-T2 and DVB-S2 max 255, ISDB max 65535)",
+ -1, 65535, DEFAULT_STREAM_ID, G_PARAM_READWRITE));
}
/* initialize the new element
@@ -543,6 +601,9 @@ gst_dvbsrc_init (GstDvbSrc * object)
object->inversion = DEFAULT_INVERSION;
object->stats_interval = DEFAULT_STATS_REPORTING_INTERVAL;
object->delsys = DEFAULT_DELSYS;
+ object->pilot = DEFAULT_PILOT;
+ object->rolloff = DEFAULT_ROLLOFF;
+ object->stream_id = DEFAULT_STREAM_ID;
g_mutex_init (&object->tune_mutex);
object->timeout = DEFAULT_TIMEOUT;
@@ -696,6 +757,15 @@ gst_dvbsrc_set_property (GObject * _object, guint prop_id,
case ARG_DVBSRC_DELSYS:
object->delsys = g_value_get_enum (value);
break;
+ case ARG_DVBSRC_PILOT:
+ object->pilot = g_value_get_enum (value);
+ break;
+ case ARG_DVBSRC_ROLLOFF:
+ object->rolloff = g_value_get_enum (value);
+ break;
+ case ARG_DVBSRC_STREAM_ID:
+ object->stream_id = g_value_get_int (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -768,6 +838,15 @@ gst_dvbsrc_get_property (GObject * _object, guint prop_id,
case ARG_DVBSRC_DELSYS:
g_value_set_enum (value, object->delsys);
break;
+ case ARG_DVBSRC_PILOT:
+ g_value_set_enum (value, object->pilot);
+ break;
+ case ARG_DVBSRC_ROLLOFF:
+ g_value_set_enum (value, object->rolloff);
+ break;
+ case ARG_DVBSRC_STREAM_ID:
+ g_value_set_int (value, object->stream_id);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -1385,6 +1464,8 @@ gst_dvbsrc_tune (GstDvbSrc * object)
n = 3;
switch (object->delsys) {
case SYS_DVBS:
+ case SYS_DVBS2:
+ case SYS_TURBO:
object->tone = SEC_TONE_OFF;
if (freq > 2200000) {
// this must be an absolute frequency
@@ -1401,7 +1482,7 @@ gst_dvbsrc_tune (GstDvbSrc * object)
set_prop (dvb_prop, &n, DTV_INNER_FEC, object->code_rate_hp);
GST_INFO_OBJECT (object,
- "tuning DVB-S to L-Band:%u, Pol:%d, srate=%u, 22kHz=%s",
+ "Tuning DVB-S/DVB-S2/Turbo to L-Band:%u, Pol:%d, srate=%u, 22kHz=%s",
freq, object->pol, sym_rate,
object->tone == SEC_TONE_ON ? "on" : "off");
@@ -1424,8 +1505,17 @@ gst_dvbsrc_tune (GstDvbSrc * object)
//object->send_diseqc = FALSE;
}
+ if ((object->delsys == SYS_DVBS2) || (object->delsys == SYS_TURBO))
+ set_prop (dvb_prop, &n, DTV_MODULATION, object->modulation);
+
+ if (object->delsys == SYS_DVBS2) {
+ set_prop (dvb_prop, &n, DTV_PILOT, object->pilot);
+ set_prop (dvb_prop, &n, DTV_ROLLOFF, object->rolloff);
+ set_prop (dvb_prop, &n, DTV_STREAM_ID, object->stream_id);
+ }
break;
case SYS_DVBT:
+ case SYS_DVBT2:
bandwidth = 0;
if (object->bandwidth != BANDWIDTH_AUTO) {
/* Presumably not specifying bandwidth with s2api is equivalent
@@ -1455,20 +1545,27 @@ gst_dvbsrc_tune (GstDvbSrc * object)
object->transmission_mode);
set_prop (dvb_prop, &n, DTV_GUARD_INTERVAL, object->guard_interval);
set_prop (dvb_prop, &n, DTV_HIERARCHY, object->hierarchy_information);
+ if (object->delsys == SYS_DVBT2) {
+ set_prop (dvb_prop, &n, DTV_STREAM_ID, object->stream_id);
+ }
- GST_INFO_OBJECT (object, "tuning DVB-T to %d Hz", freq);
+ GST_INFO_OBJECT (object, "Tuning DVB-T/DVB_T2 to %d Hz", freq);
break;
case SYS_DVBC_ANNEX_A:
+ case SYS_DVBC_ANNEX_B:
case SYS_DVBC_ANNEX_C:
GST_INFO_OBJECT (object, "Tuning DVB-C/ClearCable to %d, srate=%d",
freq, sym_rate);
- set_prop (dvb_prop, &n, DTV_INNER_FEC, object->code_rate_hp);
set_prop (dvb_prop, &n, DTV_MODULATION, object->modulation);
- set_prop (dvb_prop, &n, DTV_SYMBOL_RATE, sym_rate);
+ if (object->delsys != SYS_DVBC_ANNEX_B) {
+ set_prop (dvb_prop, &n, DTV_INNER_FEC, object->code_rate_hp);
+ set_prop (dvb_prop, &n, DTV_SYMBOL_RATE, sym_rate);
+ }
break;
case SYS_ATSC:
GST_INFO_OBJECT (object, "Tuning ATSC to %d", freq);
+
set_prop (dvb_prop, &n, DTV_MODULATION, object->modulation);
break;
default:
diff --git a/sys/dvb/gstdvbsrc.h b/sys/dvb/gstdvbsrc.h
index d9615ba..e7cfbb8 100644
--- a/sys/dvb/gstdvbsrc.h
+++ b/sys/dvb/gstdvbsrc.h
@@ -70,6 +70,9 @@ struct _GstDvbSrc
int transmission_mode;
int hierarchy_information;
int inversion;
+ int pilot;
+ int rolloff;
+ int stream_id;
guint64 timeout;
GstDvbSrcPol pol;
--
1.8.3.1
More information about the gstreamer-devel
mailing list