Skip to content

V
vlc-2-2
Commit 0883ebb2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

DVB: discriminate ITU-T J.83 A and C annexes if possible 

This requires Linux DVB 5.5.
parent b2fc6dc9
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
modules/access/dtv/linux.c
View file @ 0883ebb2
...@@ -634,7 +634,11 @@ int dvb_set_dvbc (dvb_device_t *d, uint32_t freq, const char *modstr, ...@@ -634,7 +634,11 @@ int dvb_set_dvbc (dvb_device_t *d, uint32_t freq, const char *modstr,
if (dvb_find_frontend (d, FE_QAM, FE_IS_STUPID)) if (dvb_find_frontend (d, FE_QAM, FE_IS_STUPID))
return -1; return -1;
return dvb_set_props (d, 6, DTV_CLEAR, 0, return dvb_set_props (d, 6, DTV_CLEAR, 0,
#if DVBv5(5)
DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_A,
#else
DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_AC, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_AC,
#endif
DTV_FREQUENCY, freq, DTV_MODULATION, mod, DTV_FREQUENCY, freq, DTV_MODULATION, mod,
DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec); DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec);
} }
...@@ -922,7 +926,12 @@ int dvb_set_isdbc (dvb_device_t *d, uint32_t freq, const char *modstr, ...@@ -922,7 +926,12 @@ int dvb_set_isdbc (dvb_device_t *d, uint32_t freq, const char *modstr,
if (dvb_find_frontend (d, FE_QAM, FE_IS_STUPID)) if (dvb_find_frontend (d, FE_QAM, FE_IS_STUPID))
return -1; return -1;
return dvb_set_props (d, 6, DTV_CLEAR, 0, return dvb_set_props (d, 6, DTV_CLEAR, 0,
#if DVBv5(5)
DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_C,
#else
# warning ISDB-C might need Linux DVB version 5.5 or later.
DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_AC, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_AC,
#endif
DTV_FREQUENCY, freq, DTV_MODULATION, mod, DTV_FREQUENCY, freq, DTV_MODULATION, mod,
DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec); DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment