diff options
| author | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2014-12-31 02:20:14 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-06 19:52:27 +0100 |
| commit | 7fe5d8c78e32bd7f609d410c3b769060630553fb (patch) | |
| tree | 64aba89e31d3ce21cf4308d1508e6aff25fe88b5 /stream/dvb_tune.c | |
| parent | 0c42484d8e7b064b69d92f209cf2cb082f756b97 (diff) | |
| download | mpv-7fe5d8c78e32bd7f609d410c3b769060630553fb.tar.bz2 mpv-7fe5d8c78e32bd7f609d410c3b769060630553fb.tar.xz | |
dvb: Extend understanding of VDR channel config: stream_id, inversion.
Now also "stream ID" (for DVB-S2) and "inversion" are understood.
The parameter-string can also provide information on FEC, rolloff etc. For DVB-S, "auto" which mpv uses by default should be fine, I can also confirm it works. For non-DVB-S cards, it might be useful to also parse this information in case of a vdr-channel list.
As I have no such hardware and thus would have to do it blindly, I added a FIXME.
Mostly complete vdr-channels.conf format documentation is at http://www.vdr-wiki.de/wiki/index.php/Channels.conf (german only).
Diffstat (limited to 'stream/dvb_tune.c')
| -rw-r--r-- | stream/dvb_tune.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index 67e210c038..673109152a 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -324,8 +324,8 @@ static int do_diseqc(int secfd, int sat_no, int polv, int hi_lo) } static int tune_it(dvb_priv_t *priv, int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, - bool is_dvb_s2, fe_spectral_inversion_t specInv, unsigned int diseqc, fe_modulation_t modulation, fe_code_rate_t HP_CodeRate, - fe_transmit_mode_t TransmissionMode, fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth, + bool is_dvb_s2, int stream_id, fe_spectral_inversion_t specInv, unsigned int diseqc, fe_modulation_t modulation, + fe_code_rate_t HP_CodeRate, fe_transmit_mode_t TransmissionMode, fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth, fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout) { int hi_lo = 0, dfd; @@ -424,7 +424,6 @@ static int tune_it(dvb_priv_t *priv, int fd_frontend, int fd_sec, unsigned int f delsys = SYS_DVBS2; } fe_rolloff_t rolloff = ROLLOFF_AUTO; - int stream_id = NO_STREAM_ID_FILTER; struct dtv_property p[] = { { .cmd = DTV_DELIVERY_SYSTEM, .u.data = delsys }, @@ -495,7 +494,7 @@ static int tune_it(dvb_priv_t *priv, int fd_frontend, int fd_sec, unsigned int f int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone, - bool is_dvb_s2, fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval, + bool is_dvb_s2, 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, fe_hierarchy_t hier, int timeout) { @@ -503,7 +502,7 @@ int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int to MP_INFO(priv, "dvb_tune Freq: %lu\n", (long unsigned int) freq); - ris = tune_it(priv, priv->fe_fd, priv->sec_fd, freq, srate, pol, tone, is_dvb_s2, specInv, diseqc, modulation, HP_CodeRate, TransmissionMode, guardInterval, bandWidth, LP_CodeRate, hier, timeout); + ris = tune_it(priv, priv->fe_fd, priv->sec_fd, freq, srate, pol, tone, is_dvb_s2, stream_id, specInv, diseqc, modulation, HP_CodeRate, TransmissionMode, guardInterval, bandWidth, LP_CodeRate, hier, timeout); if(ris != 0) MP_INFO(priv, "dvb_tune, TUNING FAILED\n"); |