/*****************************************************************************
* Copyright © 2011 Rémi Denis-Courmont
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- ****************************************************************************/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#include <vlc_common.h>
#include <vlc_access.h>
+#include <vlc_input.h>
#include <vlc_plugin.h>
#include <vlc_dialog.h>
+#include <search.h>
#include "dtv/dtv.h"
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
- "The cache size (delay) for digital broadcasts (in milliseconds).")
-
#define ADAPTER_TEXT N_("DVB adapter")
#define ADAPTER_LONGTEXT N_( \
"If there is more than one digital broadcasting adapter, " \
"the adapter number must be selected. Numbering start from zero.")
-#define DEVICE_TEXT N_("DVB device")
-#define DEVICE_LONGTEXT N_( \
- "If the selected adapter has more than one tuner, " \
- "the tuner number must be selected. Numbering start from zero.")
-
#define BUDGET_TEXT N_("Do not demultiplex")
#define BUDGET_LONGTEXT N_( \
"Only useful programs are normally demultiplexed from the transponder. " \
"This option will disable demultiplexing and receive all programs.")
-#define FREQ_TEXT N_("Frequency (kHz)")
+#define NAME_TEXT N_("Network name")
+#define NAME_LONGTEXT N_("Unique network name in the System Tuning Spaces")
+
+#define CREATE_TEXT N_("Network name to create")
+#define CREATE_LONGTEXT N_("Create unique name in the System Tuning Spaces")
+
+#define FREQ_TEXT N_("Frequency (Hz)")
#define FREQ_LONGTEXT N_( \
"TV channels are grouped by transponder (a.k.a. multiplex) " \
"on a given frequency. This is required to tune the receiver.")
#define MODULATION_TEXT N_("Modulation / Constellation")
+#define MODULATION_A_TEXT N_("Layer A modulation")
+#define MODULATION_B_TEXT N_("Layer B modulation")
+#define MODULATION_C_TEXT N_("Layer C modulation")
#define MODULATION_LONGTEXT N_( \
"The digital signal can be modulated according with different " \
"constellations (depending on the delivery system). " \
#define CODE_RATE_TEXT N_("FEC code rate")
#define CODE_RATE_HP_TEXT N_("High-priority code rate")
#define CODE_RATE_LP_TEXT N_("Low-priority code rate")
+#define CODE_RATE_A_TEXT N_("Layer A code rate")
+#define CODE_RATE_B_TEXT N_("Layer B code rate")
+#define CODE_RATE_C_TEXT N_("Layer C code rate")
#define CODE_RATE_LONGTEXT N_( \
"The code rate for Forward Error Correction can be specified.")
static const char *const code_rate_vlc[] = { "",
- "none", /*"1/4", "1/3",*/ "1/2", "3/5", "2/3", "3/4",
+ "0", /*"1/4", "1/3",*/ "1/2", "3/5", "2/3", "3/4",
"4/5", "5/6", "6/7", "7/8", "8/9", "9/10",
};
static const char *const code_rate_user[] = { N_("Automatic"),
#define TRANSMISSION_TEXT N_("Transmission mode")
const int transmission_vlc[] = { -1,
- 2, 4, 8, /*16, 32,*/
+ 1, 2, 4, 8, 16, 32,
};
static const char *const transmission_user[] = { N_("Automatic"),
- "2k", "4k", "8k", /*"16k", "32k", */
+ "1k", "2k", "4k", "8k", "16k", "32k",
};
#define BANDWIDTH_TEXT N_("Bandwidth (MHz)")
const int bandwidth_vlc[] = { 0,
- 8, 7, 6,
+ 10, 8, 7, 6, 5, 2
};
static const char *const bandwidth_user[] = { N_("Automatic"),
- N_("8 MHz"), N_("7 MHz"), N_("6 MHz"),
+ N_("10 MHz"), N_("8 MHz"), N_("7 MHz"), N_("6 MHz"),
+ N_("5 MHz"), N_("1.712 MHz"),
};
#define GUARD_TEXT N_("Guard interval")
const char *const guard_vlc[] = { "",
- /*"1/128",*/ "1/32", "1/16", /*"19/128",*/ "1/8", /*"9/256",*/ "1/4",
+ "1/128", "1/32", "1/16", "19/256", "1/8", "19/128", "1/4",
};
static const char *const guard_user[] = { N_("Automatic"),
- /*"1/128",*/ "1/32", "1/16", /*"19/128",*/ "1/8", /*"9/256",*/ "1/4",
+ "1/128", "1/32", "1/16", "19/256", "1/8", "19/128", "1/4",
};
#define HIERARCHY_TEXT N_("Hierarchy mode")
N_("None"), "1", "2", "4",
};
+#define SEGMENT_COUNT_A_TEXT N_("Layer A segments count")
+#define SEGMENT_COUNT_B_TEXT N_("Layer B segments count")
+#define SEGMENT_COUNT_C_TEXT N_("Layer C segments count")
+
+#define TIME_INTERLEAVING_A_TEXT N_("Layer A time interleaving")
+#define TIME_INTERLEAVING_B_TEXT N_("Layer B time interleaving")
+#define TIME_INTERLEAVING_C_TEXT N_("Layer C time interleaving")
+
#define PILOT_TEXT N_("Pilot")
+
#define ROLLOFF_TEXT N_("Roll-off factor")
const int rolloff_vlc[] = { -1,
35, 20, 25,
N_("0.35 (same as DVB-S)"), N_("0.20"), N_("0.25"),
};
+#define TS_ID_TEXT N_("Transport stream ID")
+
#define POLARIZATION_TEXT N_("Polarization (Voltage)")
#define POLARIZATION_LONGTEXT N_( \
"To select the polarization of the transponder, a different voltage " \
N_("Vertical (13V)"), N_("Horizontal (18V)"),
N_("Circular Right Hand (13V)"), N_("Circular Left Hand (18V)") };
+#define HIGH_VOLTAGE_TEXT N_("High LNB voltage")
+#define HIGH_VOLTAGE_LONGTEXT N_( \
+ "If the cables between the satellilte low noise block-downconverter and " \
+ "the receiver are long, higher voltage may be required.\n" \
+ "Not all receivers support this.")
+
+#define LNB_LOW_TEXT N_("Local oscillator low frequency (kHz)")
+#define LNB_HIGH_TEXT N_("Local oscillator high frequency (kHz)")
+#define LNB_LONGTEXT N_( \
+ "The downconverter (LNB) will substract the local oscillator frequency " \
+ "from the satellite transmission frequency. " \
+ "The intermediate frequency (IF) on the RF cable is the result.")
+#define LNB_SWITCH_TEXT N_("Universal LNB switch frequency (kHz)")
+#define LNB_SWITCH_LONGTEXT N_( \
+ "If the satellite transmission frequency exceeds the switch frequency, " \
+ "the oscillator high frequency will be used as reference. " \
+ "Furthermore the automatic continuous 22kHz tone will be sent.")
+#define TONE_TEXT N_("Continuous 22kHz tone")
+#define TONE_LONGTEXT N_( \
+ "A continuous tone at 22kHz can be sent on the cable. " \
+ "This normally selects the higher frequency band from a universal LNB.")
+
+#define SATNO_TEXT N_("DiSEqC LNB number")
+#define SATNO_LONGTEXT N_( \
+ "If the satellite receiver is connected to multiple " \
+ "low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \
+ "the correct LNB can be selected (1 to 4). " \
+ "If there is no switch, this parameter should be 0.")
+#ifdef __linux__
+static const int satno_vlc[] = { 0, 1, 2, 3, 4 };
+static const char *const satno_user[] = { N_("Unspecified"),
+ "A/1", "B/2", "C/3", "D/4" };
+#endif
+
+/* BDA module additional DVB-S Parameters */
+#define NETID_TEXT N_("Network identifier")
+#define AZIMUTH_TEXT N_("Satellite azimuth")
+#define AZIMUTH_LONGTEXT N_("Satellite azimuth in tenths of degree")
+#define ELEVATION_TEXT N_("Satellite elevation")
+#define ELEVATION_LONGTEXT N_("Satellite elevation in tenths of degree")
+#define LONGITUDE_TEXT N_("Satellite longitude")
+#define LONGITUDE_LONGTEXT N_( \
+ "Satellite longitude in tenths of degree. West is negative.")
+
+#define RANGE_TEXT N_("Satellite range code")
+#define RANGE_LONGTEXT N_("Satellite range code as defined by manufacturer " \
+ "e.g. DISEqC switch code")
+
+/* ATSC */
+#define MAJOR_CHANNEL_TEXT N_("Major channel")
+#define MINOR_CHANNEL_TEXT N_("ATSC minor channel")
+#define PHYSICAL_CHANNEL_TEXT N_("Physical channel")
+
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
vlc_module_begin ()
set_shortname (N_("DTV"))
- set_description (N_("Digital Television and Radio (Linux DVB)"))
+ set_description (N_("Digital Television and Radio"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
set_capability ("access", 0)
set_callbacks (Open, Close)
add_shortcut ("dtv", "tv", "dvb", /* "radio", "dab",*/
- "cable", "dvb-c", /*"satellite", "dvb-s", "dvb-s2",*/
- "terrestrial", "dvb-t", "atsc")
-
- /* All options starting with dvb- can be overriden in the MRL, so they
- * must all be "safe". Nevertheless, we do not mark as safe those that are
- * really specific to the local system (e.g. device ID...).
- * It wouldn't make sense to deliver those through a playlist. */
+ "cable", "dvb-c", "cqam", "isdb-c",
+ "satellite", "dvb-s", "dvb-s2", "isdb-s",
+ "terrestrial", "dvb-t", "dvb-t2", "isdb-t", "atsc",
+ "dvbt")
- add_integer ("dvb-caching", DEFAULT_PTS_DELAY / 1000,
- CACHING_TEXT, CACHING_LONGTEXT, true)
- change_integer_range (0, 60000)
- change_safe ()
#ifdef __linux__
add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false)
change_integer_range (0, 255)
- add_integer ("dvb-device", 0, DEVICE_TEXT, DEVICE_LONGTEXT, false)
- change_integer_range (0, 255)
+ change_safe ()
+ add_obsolete_integer ("dvb-device")
add_bool ("dvb-budget-mode", false, BUDGET_TEXT, BUDGET_LONGTEXT, true)
+#endif
+#ifdef WIN32
+ add_integer ("dvb-adapter", -1, ADAPTER_TEXT, ADAPTER_LONGTEXT, true)
+ change_safe ()
+ add_string ("dvb-network-name", "", NAME_TEXT, NAME_LONGTEXT, true)
+ /* Hmm: is this one really safe??: */
+ add_string ("dvb-create-name", "", CREATE_TEXT, CREATE_LONGTEXT, true)
+ change_private ()
#endif
add_integer ("dvb-frequency", 0, FREQ_TEXT, FREQ_LONGTEXT, false)
change_integer_range (0, 107999999)
change_safe ()
set_section (N_("Terrestrial reception parameters"), NULL)
- add_integer ("dvb-bandwidth", -1, BANDWIDTH_TEXT, BANDWIDTH_TEXT, true)
+ add_integer ("dvb-bandwidth", 0, BANDWIDTH_TEXT, BANDWIDTH_TEXT, true)
change_integer_list (bandwidth_vlc, bandwidth_user)
change_safe ()
- add_string ("dvb-code-rate-hp", "",
- CODE_RATE_HP_TEXT, CODE_RATE_LONGTEXT, false)
- change_string_list (code_rate_vlc, code_rate_user, NULL)
- change_safe ()
- add_string ("dvb-code-rate-lp", "",
- CODE_RATE_LP_TEXT, CODE_RATE_LONGTEXT, false)
- change_string_list (code_rate_vlc, code_rate_user, NULL)
- change_safe ()
add_integer ("dvb-transmission", 0,
TRANSMISSION_TEXT, TRANSMISSION_TEXT, true)
change_integer_list (transmission_vlc, transmission_user)
add_string ("dvb-guard", "", GUARD_TEXT, GUARD_TEXT, true)
change_string_list (guard_vlc, guard_user, NULL)
change_safe ()
+
+ set_section (N_("DVB-T reception parameters"), NULL)
+ add_string ("dvb-code-rate-hp", "",
+ CODE_RATE_HP_TEXT, CODE_RATE_LONGTEXT, true)
+ change_string_list (code_rate_vlc, code_rate_user, NULL)
+ change_safe ()
+ add_string ("dvb-code-rate-lp", "",
+ CODE_RATE_LP_TEXT, CODE_RATE_LONGTEXT, true)
+ change_string_list (code_rate_vlc, code_rate_user, NULL)
+ change_safe ()
add_integer ("dvb-hierarchy", -1, HIERARCHY_TEXT, HIERARCHY_TEXT, true)
change_integer_list (hierarchy_vlc, hierarchy_user)
change_safe ()
+ set_section (N_("ISDB-T reception parameters"), NULL)
+ add_string ("dvb-a-modulation", NULL,
+ MODULATION_A_TEXT, MODULATION_LONGTEXT, true)
+ change_string_list (modulation_vlc, modulation_user, NULL)
+ change_safe ()
+ add_string ("dvb-a-fec", NULL, CODE_RATE_A_TEXT, CODE_RATE_LONGTEXT, true)
+ change_string_list (code_rate_vlc, code_rate_user, NULL)
+ change_safe ()
+ add_integer ("dvb-a-count", 0, SEGMENT_COUNT_A_TEXT, NULL, true)
+ change_integer_range (0, 13)
+ change_safe ()
+ add_integer ("dvb-a-interleaving", 0, TIME_INTERLEAVING_A_TEXT, NULL, true)
+ change_integer_range (0, 3)
+ change_safe ()
+ add_string ("dvb-b-modulation", NULL,
+ MODULATION_B_TEXT, MODULATION_LONGTEXT, true)
+ change_string_list (modulation_vlc, modulation_user, NULL)
+ change_safe ()
+ add_string ("dvb-b-fec", NULL, CODE_RATE_B_TEXT, CODE_RATE_LONGTEXT, true)
+ change_string_list (code_rate_vlc, code_rate_user, NULL)
+ change_safe ()
+ add_integer ("dvb-b-count", 0, SEGMENT_COUNT_B_TEXT, NULL, true)
+ change_integer_range (0, 13)
+ change_safe ()
+ add_integer ("dvb-b-interleaving", 0, TIME_INTERLEAVING_B_TEXT, NULL, true)
+ change_integer_range (0, 3)
+ change_safe ()
+ add_string ("dvb-c-modulation", NULL,
+ MODULATION_C_TEXT, MODULATION_LONGTEXT, true)
+ change_string_list (modulation_vlc, modulation_user, NULL)
+ change_safe ()
+ add_string ("dvb-c-fec", NULL, CODE_RATE_C_TEXT, CODE_RATE_LONGTEXT, true)
+ change_string_list (code_rate_vlc, code_rate_user, NULL)
+ change_safe ()
+ add_integer ("dvb-c-count", 0, SEGMENT_COUNT_C_TEXT, NULL, true)
+ change_integer_range (0, 13)
+ change_safe ()
+ add_integer ("dvb-c-interleaving", 0, TIME_INTERLEAVING_C_TEXT, NULL, true)
+ change_integer_range (0, 3)
+ change_safe ()
+
set_section (N_("Cable and satellite reception parameters"), NULL)
- add_string ("dvb-modulation", 0,
+ add_string ("dvb-modulation", NULL,
MODULATION_TEXT, MODULATION_LONGTEXT, false)
change_string_list (modulation_vlc, modulation_user, NULL)
change_safe ()
add_integer ("dvb-srate", 0, SRATE_TEXT, SRATE_LONGTEXT, false)
change_integer_range (0, UINT64_C(0xffffffff))
change_safe ()
- add_string ("dvb-code-rate", "", CODE_RATE_TEXT, CODE_RATE_LONGTEXT, true)
+ add_string ("dvb-fec", "", CODE_RATE_TEXT, CODE_RATE_LONGTEXT, true)
change_string_list (code_rate_vlc, code_rate_user, NULL)
change_safe ()
- add_integer ("dvb-fec", 9, " ", " ", true)
- change_integer_range (0, 9)
- change_private ()
- change_safe ()
+
set_section (N_("DVB-S2 parameters"), NULL)
add_integer ("dvb-pilot", -1, PILOT_TEXT, PILOT_TEXT, true)
change_integer_list (auto_off_on_vlc, auto_off_on_user)
add_integer ("dvb-rolloff", -1, ROLLOFF_TEXT, ROLLOFF_TEXT, true)
change_integer_list (rolloff_vlc, rolloff_user)
change_safe ()
+
+ set_section (N_("ISDB-S parameters"), NULL)
+ add_integer ("dvb-ts-id", 0, TS_ID_TEXT, TS_ID_TEXT, false)
+ change_integer_range (0, 0xffff)
+ change_safe ()
+
set_section (N_("Satellite equipment control"), NULL)
add_string ("dvb-polarization", "",
POLARIZATION_TEXT, POLARIZATION_LONGTEXT, false)
change_string_list (polarization_vlc, polarization_user, NULL)
change_safe ()
- add_integer ("dvb-voltage", 13, " ", " ", true)
+ add_integer ("dvb-voltage", 13, "", "", true)
change_integer_range (0, 18)
change_private ()
change_safe ()
-#if 0 //def __linux__
+#ifdef __linux__
add_bool ("dvb-high-voltage", false,
HIGH_VOLTAGE_TEXT, HIGH_VOLTAGE_LONGTEXT, false)
- add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true)
- change_integer_list (tone_vlc, auto_off_on)
- change_safe ()
#endif
-#if 0
- add_integer ("dvb-lnb-lof1", 0, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT, true)
+ add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- change_safe ()
- add_integer ("dvb-lnb-lof2", 0, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, true)
+ add_obsolete_integer ("dvb-lnb-lof1") /* since 2.0.0 */
+ add_integer ("dvb-lnb-high", 0, LNB_HIGH_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- change_safe ()
- add_integer ("dvb-lnb-slof", 0, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, true)
+ add_obsolete_integer ("dvb-lnb-lof2") /* since 2.0.0 */
+ add_integer ("dvb-lnb-switch", 11700000,
+ LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- change_safe ()
+ add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */
+#ifdef __linux__
add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
change_integer_list (satno_vlc, satno_user)
- change_safe ()
+ add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true)
+ change_integer_list (auto_off_on_vlc, auto_off_on_user)
+#endif
+#ifdef WIN32
+ add_integer ("dvb-network-id", 0, NETID_TEXT, NETID_TEXT, true)
+ add_integer ("dvb-azimuth", 0, AZIMUTH_TEXT, AZIMUTH_LONGTEXT, true)
+ add_integer ("dvb-elevation", 0, ELEVATION_TEXT, ELEVATION_LONGTEXT, true)
+ add_integer ("dvb-longitude", 0, LONGITUDE_TEXT, LONGITUDE_LONGTEXT, true)
+ add_string ("dvb-range", "", RANGE_TEXT, RANGE_LONGTEXT, true)
+ /* dvb-range corresponds to the BDA InputRange parameter which is
+ * used by some drivers to control the diseqc */
+
+ set_section (N_("ATSC reception parameters"), NULL)
+ add_integer ("dvb-major-channel", 0, MAJOR_CHANNEL_TEXT, NULL, true)
+ add_integer ("dvb-minor-channel", 0, MINOR_CHANNEL_TEXT, NULL, true)
+ add_integer ("dvb-physical-channel", 0, PHYSICAL_CHANNEL_TEXT, NULL, true)
#endif
vlc_module_end ()
struct access_sys_t
{
dvb_device_t *dev;
+ uint8_t signal_poll;
};
-struct delsys
+typedef struct delsys
{
- int (*setup) (vlc_object_t *, dvb_device_t *, unsigned freq);
+ int (*setup) (vlc_object_t *, dvb_device_t *, uint64_t freq);
/* TODO: scan stuff */
-};
+} delsys_t;
+
+static const delsys_t dvbc, dvbs, dvbs2, dvbt, dvbt2;
+static const delsys_t isdbc, isdbs, isdbt;
+static const delsys_t atsc, cqam;
static block_t *Read (access_t *);
static int Control (access_t *, int, va_list);
static const delsys_t *GuessSystem (const char *, dvb_device_t *);
-static int Tune (vlc_object_t *, dvb_device_t *, const delsys_t *, unsigned);
-static unsigned var_InheritFrequency (vlc_object_t *);
+static int Tune (vlc_object_t *, dvb_device_t *, const delsys_t *, uint64_t);
+static uint64_t var_InheritFrequency (vlc_object_t *);
static int Open (vlc_object_t *obj)
{
return VLC_ENOMEM;
var_LocationParse (obj, access->psz_location, "dvb-");
- unsigned freq = var_InheritFrequency (obj);
- dvb_device_t *dev = dvb_open (obj, freq != 0);
+ dvb_device_t *dev = dvb_open (obj);
if (dev == NULL)
{
free (sys);
}
sys->dev = dev;
+ sys->signal_poll = 0;
access->p_sys = sys;
+ uint64_t freq = var_InheritFrequency (obj);
if (freq != 0)
{
const delsys_t *delsys = GuessSystem (access->psz_access, dev);
if (delsys == NULL || Tune (obj, dev, delsys, freq))
{
- msg_Err (obj, "tuning to %u kHz failed", freq);
+ msg_Err (obj, "tuning to %"PRIu64" Hz failed", freq);
dialog_Fatal (obj, N_("Digital broadcasting"),
N_("The selected digital tuner does not support "
"the specified parameters.\n"
}
block->i_buffer = val;
+
+ /* Fetch the signal levels every so often. Some devices do not like this
+ * to be requested too frequently, e.g. due to low bandwidth I²C bus. */
+ if ((sys->signal_poll++) == 0)
+ access->info.i_update |= INPUT_UPDATE_SIGNAL;
+
return block;
}
case ACCESS_GET_PTS_DELAY:
{
int64_t *v = va_arg (args, int64_t *);
- *v = var_InheritInteger (access, "dvb-caching") * INT64_C(1000);
+ *v = var_InheritInteger (access, "live-caching") * INT64_C(1000);
return VLC_SUCCESS;
}
}
case ACCESS_SET_PRIVATE_ID_CA:
- /* TODO */
- return VLC_EGENERIC;
+#ifdef HAVE_DVBPSI
+ {
+ struct dvbpsi_pmt_s *pmt = va_arg (args, struct dvbpsi_pmt_s *);
+
+ dvb_set_ca_pmt (dev, pmt);
+ return VLC_SUCCESS;
+ }
+#endif
case ACCESS_GET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
/** Determines which delivery system to use. */
static const delsys_t *GuessSystem (const char *scheme, dvb_device_t *dev)
{
- /* NOTE: We should guess the delivery system for the "cable", "satellite"
- * and "terrestrial" shortcuts (i.e. DVB, ISDB, ATSC...). But there is
- * seemingly no sane way to do get the info with Linux DVB version 5.2.
- * In particular, the frontend infos distinguish only the modulator class
- * (QPSK, QAM, OFDM or ATSC).
- *
- * Furthermore, if the demodulator supports 2G, we cannot guess whether
- * 1G or 2G is intended. For backward compatibility, 1G is assumed
- * (this is not a limitation of Linux DVB). We will probably need something
- * smarter when 2G (semi automatic) scanning is implemented. */
- if (!strcasecmp (scheme, "cable"))
- scheme = "dvb-c";
- else
- if (!strcasecmp (scheme, "satellite"))
- scheme = "dvb-s";
- else
- if (!strcasecmp (scheme, "terrestrial"))
- scheme = "dvb-t";
-
+ /* Specific delivery system is specified */
if (!strcasecmp (scheme, "atsc"))
return &atsc;
+ if (!strcasecmp (scheme, "cqam"))
+ return &cqam;
if (!strcasecmp (scheme, "dvb-c"))
return &dvbc;
if (!strcasecmp (scheme, "dvb-s"))
return &dvbs2;
if (!strcasecmp (scheme, "dvb-t"))
return &dvbt;
+ if (!strcasecmp (scheme, "dvb-t2"))
+ return &dvbt2;
+ if (!strcasecmp (scheme, "isdb-c"))
+ return &isdbc;
+ if (!strcasecmp (scheme, "isdb-s"))
+ return &isdbs;
+ if (!strcasecmp (scheme, "isdb-t"))
+ return &isdbt;
+
+ /* If the demodulator supports 2G, we cannot guess whether
+ * 1G or 2G is intended. For backward compatibility, 1G is assumed
+ * (this is not a limitation of Linux DVB). We will probably need something
+ * smarter when 2G (semi automatic) scanning is implemented. */
+ unsigned systems = dvb_enum_systems (dev);
- return dvb_guess_system (dev);
+ /* Only wave carrier is specified */
+ if (!strcasecmp (scheme, "cable"))
+ {
+ if (systems & DVB_C)
+ return &dvbc;
+ if (systems & CQAM)
+ return &cqam;
+ if (systems & ISDB_C)
+ return &isdbc;
+ }
+ if (!strcasecmp (scheme, "satellite"))
+ {
+ if (systems & DVB_S)
+ return &dvbs;
+ if (systems & ISDB_S)
+ return &isdbs;
+ }
+ if (!strcasecmp (scheme, "terrestrial"))
+ {
+ if (systems & DVB_T)
+ return &dvbc;
+ if (systems & ATSC)
+ return &cqam;
+ if (systems & ISDB_T)
+ return &isdbt;
+ }
+
+ /* Only standards family or nothing is specified */
+ if (systems & DVB_C)
+ return &dvbc;
+ if (systems & DVB_S)
+ return &dvbc;
+ if (systems & DVB_T)
+ return &dvbt;
+ if (systems & ATSC)
+ return &atsc;
+ return NULL;
}
/** Set parameters and tune the device */
static int Tune (vlc_object_t *obj, dvb_device_t *dev, const delsys_t *delsys,
- unsigned freq)
+ uint64_t freq)
{
if (delsys->setup (obj, dev, freq)
|| dvb_set_inversion (dev, var_InheritInteger (obj, "dvb-inversion"))
return VLC_SUCCESS;
}
-static unsigned var_InheritFrequency (vlc_object_t *obj)
+static uint64_t var_InheritFrequency (vlc_object_t *obj)
{
- unsigned freq = var_InheritInteger (obj, "dvb-frequency");
- if (freq >= 108000000)
+ uint64_t freq = var_InheritInteger (obj, "dvb-frequency");
+ if (freq != 0 && freq <= 108000000)
{
- msg_Err (obj, "%u kHz frequency is too high.", freq);
- freq /= 1000;
- msg_Info (obj, "Assuming %u kHz carrier frequency instead.", freq);
+ msg_Err (obj, "%"PRIu64" Hz carrier frequency is too low.", freq);
+ freq *= 1000;
+ msg_Info (obj, "Assuming %"PRIu64" Hz frequency instead.", freq);
}
return freq;
}
-static char *var_InheritCodeRate (vlc_object_t *obj)
+static uint32_t var_InheritCodeRate (vlc_object_t *obj, const char *varname)
{
- char *code_rate = var_InheritString (obj, "dvb-code-rate");
- if (code_rate != NULL)
- return code_rate;
-
- /* Backward compatibility with VLC < 1.2 (= Linux DVBv3 enum) */
- unsigned fec = var_InheritInteger (obj, "dvb-fec");
- if (fec < 9)
+ char *code_rate = var_InheritString (obj, varname);
+ if (code_rate == NULL)
+ return VLC_FEC_AUTO;
+
+ uint16_t a, b;
+ int v = sscanf (code_rate, "%"SCNu16"/%"SCNu16, &a, &b);
+ free (code_rate);
+ switch (v)
{
- static const char linux_dvb[9][5] = {
- "none", "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8" };
- msg_Warn (obj, "\"fec=%u\" option is obsolete. "
- "Use \"code-rate=%s\" instead.", fec, linux_dvb[fec]);
- return strdup (linux_dvb[fec]);
+ case 2:
+ return VLC_FEC(a, b);
+ case 1:
+ if (a == 0)
+ return 0;
+ /* Backward compatibility with VLC < 1.2 (= Linux DVBv3 enum) */
+ if (a < 9)
+ {
+ msg_Warn (obj, "\"%s=%"PRIu16"\" option is obsolete. "
+ "Use \"%s=%"PRIu16"/%"PRIu16"\" instead.",
+ varname + 4, a, varname + 4, a, a + 1);
+ return VLC_FEC(a, a + 1);
+ }
+ else
+ msg_Warn (obj, "\"fec=9\" option is obsolete.");
}
- return NULL;
+ return VLC_FEC_AUTO;
}
-static char *var_InheritModulation (vlc_object_t *obj)
+static int modcmp (const void *a, const void *b)
{
- char *mod = var_InheritString (obj, "dvb-modulation");
+ return strcasecmp (a, *(const char *const *)b);
+}
+
+static const char *var_InheritModulation (vlc_object_t *obj, const char *var)
+{
+ char *mod = var_InheritString (obj, var);
if (mod == NULL)
- return mod;
+ return "";
- char *end;
- unsigned long l = strtol (mod, &end, 0);
- if (*end != '\0') /* not a number = not from VLC < 1.2 */
- return mod;
+ size_t n = sizeof (modulation_vlc) / sizeof (modulation_vlc[0]);
+ const char *const *p = lfind (mod, modulation_vlc, &n, sizeof (mod), modcmp);
+ if (p != NULL)
+ {
+ free (mod);
+ return *p;
+ }
/* Backward compatibility with VLC < 1.2 */
const char *str;
- switch (l)
+ switch (atoi (mod))
{
case -1: str = "QPSK"; break;
case 0: str = "QAM"; break;
case 64: str = "64QAM"; break;
case 128: str = "128QAM"; break;
case 256: str = "256QAM"; break;
- default: return mod;
+ default: return "";
}
- msg_Warn (obj, "\"modulation=%ld\" option is obsolete. "
- "Use \"modulation=%s\" instead.", l, str);
- return strdup (str);
+ msg_Warn (obj, "\"modulation=%s\" option is obsolete. "
+ "Use \"modulation=%s\" instead.", mod, str);
+ free (mod);
+ return str;
+}
+
+static unsigned var_InheritGuardInterval (vlc_object_t *obj)
+{
+ char *guard = var_InheritString (obj, "dvb-guard");
+ if (guard == NULL)
+ return VLC_GUARD_AUTO;
+
+ uint16_t a, b;
+ int v = sscanf (guard, "%"SCNu16"/%"SCNu16, &a, &b);
+ free (guard);
+ switch (v)
+ {
+ case 1:
+ /* Backward compatibility with VLC < 1.2 */
+ if (a == 0)
+ break;
+ msg_Warn (obj, "\"guard=%"PRIu16"\" option is obsolete. "
+ "Use \"guard=1/%"PRIu16" instead.", a, a);
+ b = a;
+ a = 1;
+ case 2:
+ return VLC_GUARD(a, b);
+ }
+ return VLC_GUARD_AUTO;
}
/*** ATSC ***/
-static int atsc_setup (vlc_object_t *obj, dvb_device_t *dev, unsigned freq)
+static int atsc_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
- char *mod = var_InheritModulation (obj);
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
- int ret = dvb_set_atsc (dev, freq, mod);
- free (mod);
- return ret;
+ return dvb_set_atsc (dev, freq, mod);
}
-const delsys_t atsc = { .setup = atsc_setup };
+static const delsys_t atsc = { .setup = atsc_setup };
+
+static int cqam_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+{
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+
+ return dvb_set_cqam (dev, freq, mod);
+}
+
+static const delsys_t cqam = { .setup = cqam_setup };
/*** DVB-C ***/
-static int dvbc_setup (vlc_object_t *obj, dvb_device_t *dev, unsigned freq)
+static int dvbc_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
- char *mod = var_InheritModulation (obj);
- char *fec = var_InheritCodeRate (obj);
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+ uint32_t fec = var_InheritCodeRate (obj, "dvb-fec");
unsigned srate = var_InheritInteger (obj, "dvb-srate");
- int ret = dvb_set_dvbc (dev, freq, mod, srate, fec);
- free (fec);
- free (mod);
- return ret;
+ return dvb_set_dvbc (dev, freq, mod, srate, fec);
}
-const delsys_t dvbc = { .setup = dvbc_setup };
+static const delsys_t dvbc = { .setup = dvbc_setup };
/*** DVB-S ***/
return pol;
}
-static int sec_setup (vlc_object_t *obj, dvb_device_t *dev)
+static int sec_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
char pol = var_InheritPolarization (obj);
+ unsigned lowf = var_InheritInteger (obj, "dvb-lnb-low");
+ unsigned highf = var_InheritInteger (obj, "dvb-lnb-high");
+ unsigned switchf = var_InheritInteger (obj, "dvb-lnb-switch");
- return dvb_set_sec (dev, pol);
+ return dvb_set_sec (dev, freq, pol, lowf, highf, switchf);
}
-static int dvbs_setup (vlc_object_t *obj, dvb_device_t *dev, unsigned freq)
+static int dvbs_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
- char *fec = var_InheritCodeRate (obj);
+ uint32_t fec = var_InheritCodeRate (obj, "dvb-fec");
uint32_t srate = var_InheritInteger (obj, "dvb-srate");
- /* FIXME: adjust frequency (offset) */
int ret = dvb_set_dvbs (dev, freq, srate, fec);
- free (fec);
if (ret == 0)
- ret = sec_setup (obj, dev);
+ ret = sec_setup (obj, dev, freq);
return ret;
}
-static int dvbs2_setup (vlc_object_t *obj, dvb_device_t *dev, unsigned freq)
+static int dvbs2_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
- char *mod = var_InheritModulation (obj);
- char *fec = var_InheritCodeRate (obj);
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+ uint32_t fec = var_InheritCodeRate (obj, "dvb-fec");
uint32_t srate = var_InheritInteger (obj, "dvb-srate");
int pilot = var_InheritInteger (obj, "dvb-pilot");
int rolloff = var_InheritInteger (obj, "dvb-rolloff");
- /* FIXME: adjust frequency (offset)? */
int ret = dvb_set_dvbs2 (dev, freq, mod, srate, fec, pilot, rolloff);
- free (fec);
- free (mod);
if (ret == 0)
- ret = sec_setup (obj, dev);
+ ret = sec_setup (obj, dev, freq);
return ret;
}
-const delsys_t dvbs = { .setup = dvbs_setup };
-const delsys_t dvbs2 = { .setup = dvbs2_setup };
+static const delsys_t dvbs = { .setup = dvbs_setup };
+static const delsys_t dvbs2 = { .setup = dvbs2_setup };
/*** DVB-T ***/
-static int dvbt_setup (vlc_object_t *obj, dvb_device_t *dev, unsigned freq)
+static int dvbt_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
{
- char *mod = var_InheritModulation (obj);
- char *fec_hp = var_InheritString (obj, "dvb-code-rate-hp");
- char *fec_lp = var_InheritString (obj, "dvb-code-rate-lp");
- char *guard = var_InheritString (obj, "dvb-guard");
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+ uint32_t fec_hp = var_InheritCodeRate (obj, "dvb-code-rate-hp");
+ uint32_t fec_lp = var_InheritCodeRate (obj, "dvb-code-rate-lp");
+ uint32_t guard = var_InheritGuardInterval (obj);
uint32_t bw = var_InheritInteger (obj, "dvb-bandwidth");
int tx = var_InheritInteger (obj, "dvb-transmission");
int h = var_InheritInteger (obj, "dvb-hierarchy");
- int ret = dvb_set_dvbt (dev, freq, mod, fec_hp, fec_lp, bw, tx, guard, h);
- free (guard);
- free (fec_lp);
- free (fec_hp);
- free (mod);
+ return dvb_set_dvbt (dev, freq, mod, fec_hp, fec_lp, bw, tx, guard, h);
+}
+
+static int dvbt2_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+{
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+ uint32_t fec = var_InheritCodeRate (obj, "dvb-fec");
+ uint32_t guard = var_InheritGuardInterval (obj);
+ uint32_t bw = var_InheritInteger (obj, "dvb-bandwidth");
+ int tx = var_InheritInteger (obj, "dvb-transmission");
+
+ return dvb_set_dvbt2 (dev, freq, mod, fec, bw, tx, guard);
+}
+
+static const delsys_t dvbt = { .setup = dvbt_setup };
+static const delsys_t dvbt2 = { .setup = dvbt2_setup };
+
+
+/*** ISDB-C ***/
+static int isdbc_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+{
+ const char *mod = var_InheritModulation (obj, "dvb-modulation");
+ uint32_t fec = var_InheritCodeRate (obj, "dvb-fec");
+ unsigned srate = var_InheritInteger (obj, "dvb-srate");
+
+ return dvb_set_isdbc (dev, freq, mod, srate, fec);
+}
+
+static const delsys_t isdbc = { .setup = isdbc_setup };
+
+
+/*** ISDB-S ***/
+static int isdbs_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+{
+ uint16_t ts_id = var_InheritInteger (obj, "dvb-ts-id");
+
+ int ret = dvb_set_isdbs (dev, freq, ts_id);
+ if (ret == 0)
+ ret = sec_setup (obj, dev, freq);
return ret;
}
-const delsys_t dvbt = { .setup = dvbt_setup };
+static const delsys_t isdbs = { .setup = isdbs_setup };
+
+
+/*** ISDB-T ***/
+static int isdbt_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+{
+ isdbt_layer_t layers[3];
+ uint32_t guard = var_InheritGuardInterval (obj);
+ uint32_t bw = var_InheritInteger (obj, "dvb-bandwidth");
+ int tx = var_InheritInteger (obj, "dvb-transmission");
+
+ for (unsigned i = 0; i < 3; i++)
+ {
+ char varname[sizeof ("dvb-X-interleaving")];
+ memcpy (varname, "dvb-X-", 4);
+ varname[4] = 'a' + i;
+
+ strcpy (varname + 6, "modulation");
+ layers[i].modulation = var_InheritModulation (obj, varname);
+ strcpy (varname + 6, "fec");
+ layers[i].code_rate = var_InheritCodeRate (obj, varname);
+ strcpy (varname + 6, "count");
+ layers[i].segment_count = var_InheritInteger (obj, varname);
+ strcpy (varname + 6, "interleaving");
+ layers[i].time_interleaving = var_InheritInteger (obj, varname);
+ }
+
+ return dvb_set_isdbt (dev, freq, bw, tx, guard, layers);
+}
+
+static const delsys_t isdbt = { .setup = isdbt_setup };
projects / vlc / blobdiff