[vlc-commits] DVB: discriminate ITU-T J.83 A and C annexes if possible

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 12 11:13:06 2012 +0200| [0883ebb27eea3a83365e823da00331213e89aae3] | committer: Rémi Denis-Courmont

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

This requires Linux DVB 5.5.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0883ebb27eea3a83365e823da00331213e89aae3
---

 modules/access/dtv/linux.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index d66fe98..ec64e3c 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -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))
         return -1;
     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,
+#endif
                           DTV_FREQUENCY, freq, DTV_MODULATION, mod,
                           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,
     if (dvb_find_frontend (d, FE_QAM, FE_IS_STUPID))
         return -1;
     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,
+#endif
                           DTV_FREQUENCY, freq, DTV_MODULATION, mod,
                           DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec);
 }