From df91e492fd3365cf7db9c6ba4a721f8fcce0521c Mon Sep 17 00:00:00 2001 From: ivan-83 Date: Mon, 13 Feb 2017 04:55:35 +0300 Subject: dvb: add support for DVB-T2 Probably does much more: + add support DVB-T2 * DVB params set to AUTO by default * MAX_CARDS: 4 -> 16 * DMX_SET_BUFFER_SIZE: 64kb -> 256kb + add DTV_CLEAR call before tune + add logic from https://github.com/olifre/mpv/commits/dvb-mixed-api-scan * rename type to delsys * single playlist per adapter * card -> adapter * fix channels order in playlist * update internal api * auto fallback to old DVB API on tune * fix DELSYS_SUPP_MASK value * remove tone - unused * add channel mem zeroize in config parser + add code from libdvbv5 for detect delivery systems * SYS_DVBC_ANNEX_AC replaced to SYS_DVBC_ANNEX_A + SYS_DVBC_ANNEX_C Signed-off-by: wm4 --- stream/dvb_tune.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'stream/dvb_tune.h') diff --git a/stream/dvb_tune.h b/stream/dvb_tune.h index dafa1175bd..756f730008 100644 --- a/stream/dvb_tune.h +++ b/stream/dvb_tune.h @@ -23,15 +23,16 @@ struct mp_log; -int dvb_get_tuner_types(int fe_fd, struct mp_log *log, int** tuner_types); -int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt); -int dvb_fix_demuxes(dvb_priv_t *priv, int cnt); + +const char *get_dvb_delsys(unsigned int delsys); +unsigned int dvb_get_tuner_delsys_mask(int fe_fd, struct mp_log *log); +int dvb_open_devices(dvb_priv_t *priv, unsigned int n, unsigned int demux_cnt); +int dvb_fix_demuxes(dvb_priv_t *priv, unsigned int cnt); int dvb_set_ts_filt(dvb_priv_t *priv, int fd, uint16_t pid, dmx_pes_type_t pestype); int dvb_get_pmt_pid(dvb_priv_t *priv, int card, int service_id); -int dvb_demux_stop(int fd); -int dvb_demux_start(int fd); -int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, - int tone, bool is_dvb_s2, int stream_id, fe_spectral_inversion_t specInv, +int dvb_tune(dvb_priv_t *priv, unsigned int delsys, + int freq, char pol, int srate, int diseqc, + int stream_id, fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval, fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate, fe_code_rate_t LP_CodeRate, -- cgit v1.2.3