Changeset ed59877cbb98259edb98433775aa4f4014e91a55

Timestamp:

10/02/04 15:57:31 (5 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1076425051 +0000

git-parent:

[916c69e30e8fea86787a4ef04eff48a80f816cd8]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1076425051 +0000

Message:

Fixes for DVB-C:
- Make sure that lnb-lof1 and lnb-lof2 can be overriden by the commandline syntax frequency=xx:lnb-lof1=xx:lnb-lof2=xx
- Added value {A,a} to polarization=xx to force INVERSION_AUTO
- Sanatized a few error messages

Files:

• modules/access/dvb/access.c (modified) (14 diffs)
• modules/access/dvb/dvb.c (modified) (2 diffs)

modules/access/dvb/access.c

@@ -91 +91 @@
-    int                 i_transmission = 0;
-    int                 i_hierarchy = 0;
-vlc_bool_t          b
+int                 i
-    int                 i_fec = 0;
-    int                 i_code_rate_HP = 0;
@@ -131 +131 @@
-    i_hierarchy = config_GetInt(p_input, "hierarchy");
-
-
-    /* Determine frontend device information and capabilities */
-    b_probe = config_GetInt( p_input, "probe" );
@@ -162 +161 @@
-        else if (strncmp( p_input->psz_access, "terrestrial",11) ==0)
-            frontend_info.type = FE_OFDM;
-
-//        frontend_info.frequency_max =   12999000; /* in KHz, lnb_lof2 */
-//        frontend_info.frequency_min =    9750000; /* lnb_lof1 */
-
-        frontend_info.frequency_max = u_lnb_lof2; /* in KHz, lnb_lof2 */
@@ -206 +202 @@
-                     psz_parser - psz_parser_init ) ) )
-                {
-b_polarisation = 
+i_polarisation = 0; //
-                }
-                else if ((!strncmp( psz_parser_init, "H" ,
@@ -214 +210 @@
-
-                {
-
+
+
+
+
+
+
+
+
+
-                }
-            }
@@ -248 +252 @@
-            {
-                u_lnb_lof1 =
-
-
+
+
+
-            }
-            else if( !strncmp( psz_parser, "lnb-lof2=",
@@ -255 +260 @@
-            {
-                u_lnb_lof2 =
-
-
+
+
+
-            }
-            else if( !strncmp( psz_parser, "lnb-slof=",
@@ -262 +268 @@
-            {
-                u_lnb_slof =
-_
+-
-                            &psz_parser, 0 );
-            }
@@ -340 +346 @@
-        {
-            psz_parser = psz_next + 1;
-b_polarisation = (vlc_bool_t)
+i_polarisation = 
-            if( *psz_next )
-            {
@@ -379 +385 @@
-    {
-        msg_Warn( p_input, "invalid symbol rate, using default one" );
-
+s
-        if ( ((u_srate) > frontend_info.symbol_rate_max) ||
-             ((u_srate) < frontend_info.symbol_rate_min) )
-        {
-            msg_Err( p_input, "invalid default symbol rate" );
-            return -1;
-        }
-    }
-
-    if( b_polarisation && (b_polarisation != 1) )
-    {
-        msg_Warn( p_input, "invalid polarization, using default one" );
-        b_polarisation = config_GetInt( p_input, "polarization" );
-        if( b_polarisation && b_polarisation != 1 )
-        {
-            msg_Err( p_input, "invalid default polarization" );
-            return -1;
-        }
@@ -417 +412 @@
-        case FE_QPSK:
-            fep.frequency = u_freq; /* KHz */
-(int) b
+i
-            fep.u.qpsk.symbol_rate = u_srate;
-            fep.u.qpsk.fec_inner = dvb_DecodeFEC(p_input, i_fec); 
-satellite (QPSK) frontend found on %s
-
-b
+DVB-S: satellite (QPSK) frontend %s found
+
+i
-                               u_lnb_lof1, u_lnb_lof2, u_lnb_slof,
-                               u_adapter, u_device )<0)
-            {
- frontend returned a failure event
+: tuning failed
-                return -1;
-            }
@@ -434 +429 @@
-        case FE_QAM:
-            fep.frequency = u_freq; /* KHz */
-(int) b
+i
-            fep.u.qam.symbol_rate = u_srate;
-            fep.u.qam.fec_inner = dvb_DecodeFEC(p_input, i_fec); 
-            fep.u.qam.modulation = dvb_DecodeModulation(p_input, i_modulation); 
-cable (QAM) frontend found on %s
+DVB-C: cable (QAM) frontend %s found
-            if (ioctl_SetQAMFrontend (p_input, fep, u_adapter, u_device )<0)
-            {
- frontend returned a failure event
+: tuning failed
-                return -1;
-            }
@@ -449 +444 @@
-        case FE_OFDM:
-            fep.frequency = u_freq; /* KHz */
-(int) b
+i
-            fep.u.ofdm.bandwidth = dvb_DecodeBandwidth(p_input, i_bandwidth);
-            fep.u.ofdm.code_rate_HP = dvb_DecodeFEC(p_input, i_code_rate_HP); 
@@ -457 +452 @@
-            fep.u.ofdm.guard_interval = dvb_DecodeGuardInterval(p_input, i_guard);
-            fep.u.ofdm.hierarchy_information = dvb_DecodeHierarchy(p_input, i_hierarchy);
-terrestrial (OFDM) frontend found on %s
+DVB-T: terrestrial (OFDM) frontend %s found
-            if (ioctl_SetOFDMFrontend (p_input, fep,u_adapter, u_device )<0)
-            {
- frontend returned a failure event
+: tuning failed
-                return -1;
-            }

modules/access/dvb/dvb.c

@@ -431 +431 @@
-    }
-
+    /* Show more info on the tuning parameters used. */
+    msg_Dbg(p_input, "DVB-C: Tuning with the following paramters:");
+    msg_Dbg(p_input, "DVB-C:   Frequency %d KHz", fep.frequency );
+    msg_Dbg(p_input, "DVB-C:   Inversion/polarisation: %d",fep.inversion);
+    msg_Dbg(p_input, "DVB-C:   Symbolrate %d", fep.u.qam.symbol_rate);
+    msg_Dbg(p_input, "DVB-C:   FEC Inner %d", fep.u.qam.fec_inner);
+    msg_Dbg(p_input, "DVB-C:   Modulation %d", fep.u.qam.modulation);
+
-    /* Now send it all to the frontend device */
-    if ((ret=ioctl(front, FE_SET_FRONTEND, &fep)) < 0)
@@ -436 +444 @@
-        close(front);
-#   ifdef HAVE_ERRNO_H
-setting frontend failed (%d) %s", ret, stre
-
-setting frontend failed (
+tuning channel failed (frontend returned %d:%s)", ret, strer
+
+tuning channel failed (frontend returned 
-#   endif
-        return -1;