- Enabled tuning for DVB-C and DVB-T cards.

- Syncing with old satellite plugin.
- Cleanup of code.

modules/access/dvb/access.c

@@ -82,14 +82,20 @@ int E_(Open) ( vlc_object_t *p_this )
     unsigned int        u_device = 0;
     unsigned int        u_freq = 0;
     unsigned int        u_srate = 0;
+    int                 i_lnb_lof1;
+    int                 i_lnb_lof2;
+    int                 i_lnb_slof;
+    int                 i_bandwidth = 0;
+    int                 i_modulation = 0;
+    int                 i_guard = 0;
+    int                 i_transmission = 0;
+    int                 i_hierarchy = 0;
     vlc_bool_t          b_polarisation = 0;
     int                 i_fec = 0;
-    fe_code_rate_t      fe_fec = FEC_NONE;
+    int                 i_code_rate_HP = 0;
+    int                 i_code_rate_LP = 0;
     vlc_bool_t          b_diseqc;
     vlc_bool_t          b_probe;
-    int                 i_lnb_lof1;
-    int                 i_lnb_lof2;
-    int                 i_lnb_slof;
     char                dvr[] = DVR;
     char                frontend[] = FRONTEND;
     int                 i_len = 0;
@@ -115,17 +121,10 @@ int E_(Open) ( vlc_object_t *p_this )
             msg_Err( p_input, "(access) cannot determine frontend info" );
             return -1;
         }
-        if (frontend_info.type != FE_QPSK)
-        {
-            msg_Err( p_input, "frontend not of type satellite" );
-            return -1;
-        }
     }
-	  else /* no frontend probing is done so use default values. */
+    else /* no frontend probing is done so use default border values. */
     {
-			  int i_len;
-			  
-			  msg_Dbg( p_input, "using default values for frontend info" );
+        msg_Dbg( p_input, "using default bvalues for frontend info" );
         i_len = sizeof(FRONTEND);
         if (snprintf(frontend, sizeof(FRONTEND), FRONTEND, u_adapter, u_device) >= i_len)
         {
@@ -133,12 +132,21 @@ int E_(Open) ( vlc_object_t *p_this )
             frontend[sizeof(FRONTEND)] = '\0';
         }
         strncpy(frontend_info.name, frontend, 128);
+
+        msg_Dbg(p_input, "method of access is %s", p_input->psz_access);
+        
         frontend_info.type = FE_QPSK;
+        if (strncmp( p_input->psz_access, "qpsk",4 ) ==0)
+            frontend_info.type = FE_QPSK;
+        else if (strncmp( p_input->psz_access, "cable",5 ) ==0)
+            frontend_info.type = FE_QAM;
+        else if (strncmp( p_input->psz_access, "terrestrial",11) ==0)
+            frontend_info.type = FE_OFDM;
+
         frontend_info.frequency_max = 12999;
         frontend_info.frequency_min = 10000;
         frontend_info.symbol_rate_max = 30000;
         frontend_info.symbol_rate_min = 1000;
-				/* b_polarisation */
     }
     
     /* Register Callback functions */
@@ -164,10 +172,11 @@ int E_(Open) ( vlc_object_t *p_this )
         }
     }
 
+    /* Validating input values */
     if ( ((u_freq) > frontend_info.frequency_max) ||
          ((u_freq) < frontend_info.frequency_min) )
     {
-        msg_Warn( p_input, "invalid frequency %d, using default one", u_freq );
+        msg_Warn( p_input, "invalid frequency %d (kHz), using default one", u_freq );
         u_freq = config_GetInt( p_input, "frequency" );
         if ( ((u_freq) > frontend_info.frequency_max) ||
              ((u_freq) < frontend_info.frequency_min) )
@@ -212,57 +221,58 @@ int E_(Open) ( vlc_object_t *p_this )
         }
     }
 
-    switch( i_fec )
-    {
-        case 1:
-            fe_fec = FEC_1_2;
-            break;
-        case 2:
-            fe_fec = FEC_2_3;
-            break;
-        case 3:
-            fe_fec = FEC_3_4;
-            break;
-        case 4:
-            fe_fec = FEC_4_5;
-            break;
-        case 5:
-            fe_fec = FEC_5_6;
-            break;
-        case 6:
-            fe_fec = FEC_6_7;
-            break;
-        case 7:
-            fe_fec = FEC_7_8;
-            break;
-        case 8:
-            fe_fec = FEC_8_9;
-            break;
-        case 9:
-            fe_fec = FEC_AUTO;
-            break;
-        default:
-            /* cannot happen */
-            fe_fec = FEC_NONE;
-            msg_Err( p_input, "invalid FEC (unknown)" );
-            break;
-    }
+    /* Get antenna configuration options */
+    b_diseqc = config_GetInt( p_input, "diseqc" );
+    i_lnb_lof1 = config_GetInt( p_input, "lnb-lof1" );
+    i_lnb_lof2 = config_GetInt( p_input, "lnb-lof2" );
+    i_lnb_slof = config_GetInt( p_input, "lnb-slof" );
 
+    /* Setting frontend parameters for tuning the hardware */      
     switch( frontend_info.type )
     {
+        /* DVB-S: satellite and budget cards (nova) */
         case FE_QPSK:
             fep.frequency = u_freq * 1000;
-            fep.inversion = INVERSION_AUTO;
+            fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation);
             fep.u.qpsk.symbol_rate = u_srate * 1000;
-       	    fep.u.qpsk.fec_inner = fe_fec;
-       	    msg_Dbg( p_input, "satellite frontend found on %s", frontend_info.name );
+            fep.u.qpsk.fec_inner = dvb_DecodeFEC(p_input, i_fec); 
+            msg_Dbg( p_input, "satellite (QPSK) frontend found on %s", frontend_info.name );
             break;
+            
+        /* DVB-C */
         case FE_QAM:
-       	    msg_Dbg( p_input, "cable frontend found on %s", frontend_info.name );
+            i_modulation  = config_GetInt(p_input, "modulation");
+
+            fep.frequency = u_freq * 1000;
+            fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation);
+            fep.u.qam.symbol_rate = u_srate * 1000;
+            fep.u.qam.fec_inner = dvb_DecodeFEC(p_input, i_fec); 
+            fep.u.qam.modulation = dvb_DecodeModulation(p_input, i_modulation); 
+            msg_Dbg( p_input, "cable (QAM) frontend found on %s", frontend_info.name );
             break;
+
+        /* DVB-T */
         case FE_OFDM:
-            msg_Dbg( p_input, "terrestrial frontend found on %s", frontend_info.name );
+            i_bandwidth = config_GetInt( p_input, "bandwidth");
+            i_code_rate_HP = config_GetInt(p_input, "code-rate-hp");
+            i_code_rate_LP = config_GetInt(p_input, "code-rate-lp");
+            i_modulation  = config_GetInt(p_input, "modulation");
+            i_transmission = config_GetInt(p_input, "transmission");
+            i_guard = config_GetInt(p_input, "guard");
+            i_hierarchy = config_GetInt(p_input, "hierarchy");
+            
+            fep.frequency = u_freq * 1000;
+            fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation);
+            fep.u.ofdm.bandwidth = dvb_DecodeBandwidth(p_input, i_bandwidth);
+            fep.u.ofdm.code_rate_HP = dvb_DecodeFEC(p_input, i_code_rate_HP); 
+            fep.u.ofdm.code_rate_LP = dvb_DecodeFEC(p_input, i_code_rate_LP);
+            fep.u.ofdm.constellation = dvb_DecodeModulation(p_input, i_modulation); 
+            fep.u.ofdm.transmission_mode = dvb_DecodeTransmission(p_input, i_transmission);
+            fep.u.ofdm.guard_interval = dvb_DecodeGuardInterval(p_input, i_guard);
+            fep.u.ofdm.hierarchy_information = dvb_DecodeHierarchy(p_input, i_hierarchy);
+            msg_Dbg( p_input, "terrestrial (OFDM) frontend found on %s", frontend_info.name );
             break;
+
         default:
             msg_Err( p_input, "Could not determine frontend type on %s", frontend_info.name );
             return -1;
@@ -300,17 +310,8 @@ int E_(Open) ( vlc_object_t *p_this )
         return -1;
     }
 
-    /* Get antenna configuration options */
-    b_diseqc = config_GetInt( p_input, "diseqc" );
-    i_lnb_lof1 = config_GetInt( p_input, "lnb-lof1" );
-    i_lnb_lof2 = config_GetInt( p_input, "lnb-lof2" );
-    i_lnb_slof = config_GetInt( p_input, "lnb-slof" );
-
     /* Initialize the Satellite Card */
-    msg_Dbg( p_input, "initializing Sat Card with Freq: %u, Pol: %d, "
-                      "FEC: %d, Srate: %u", u_freq, b_polarisation, fe_fec, u_srate );
-
-    switch (ioctl_SetQPSKFrontend (p_input, fep, b_polarisation, u_adapter, u_device ))
+    switch (ioctl_SetFrontend (p_input, fep, b_polarisation, u_adapter, u_device ))
     {
         case -2:
             msg_Err( p_input, "frontend returned an unexpected event" );
@@ -463,8 +464,11 @@ int SatelliteSetProgram( input_thread_t    * p_input,
                          pgrm_descriptor_t * p_new_prg )
 {
     unsigned int i_es_index;
+    vlc_value_t val;
     unsigned int u_adapter = 1;
     unsigned int u_device = 0;
+    unsigned int u_video_type = 1; /* default video type */
+    unsigned int u_audio_type = 2; /* default audio type */
 
     // Get adapter and device number to use for this dvb card
     u_adapter = config_GetInt( p_input, "adapter" );
@@ -497,17 +501,22 @@ int SatelliteSetProgram( input_thread_t    * p_input,
         {
             case MPEG1_VIDEO_ES:
             case MPEG2_VIDEO_ES:
+            case MPEG2_MOTO_VIDEO_ES:
                 if ( input_SelectES( p_input , p_es ) == 0 )
                 {
-                    ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, 1, u_adapter, u_device);
+                    ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_video_type,
+                                       u_adapter, u_device);
+                    u_video_type += 3;
                 }
                 break;
             case MPEG1_AUDIO_ES:
             case MPEG2_AUDIO_ES:
                 if ( input_SelectES( p_input , p_es ) == 0 )
                 {
-                    ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, 2, u_adapter, u_device);
+                    ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_audio_type,
+                                       u_adapter, u_device);
                     input_SelectES( p_input , p_es );
+                    u_audio_type += 3;
                 }
                 break;
             default:
@@ -520,6 +529,10 @@ int SatelliteSetProgram( input_thread_t    * p_input,
 
     p_input->stream.p_selected_program = p_new_prg;
 
+    /* Update the navigation variables without triggering a callback */
+    val.i_int = p_new_prg->i_number;
+    var_Change( p_input, "program", VLC_VAR_SETVALUE, &val, NULL );
+
     return 0;
 }
 

modules/access/dvb/dvb.h

@@ -34,8 +34,18 @@
  * Prototypes
  *****************************************************************************/
 int ioctl_FrontendControl(input_thread_t *p_input, int freq, int pol, int lnb_slof, int diseqc, unsigned int u_adapter, unsigned int u_device );
-int ioctl_SetQPSKFrontend (input_thread_t * p_input, struct dvb_frontend_parameters fep, int b_polarisation, unsigned int u_adapter, unsigned int u_device );
+int ioctl_SetFrontend (input_thread_t * p_input, struct dvb_frontend_parameters fep, int b_polarisation, unsigned int u_adapter, unsigned int u_device );
 int ioctl_SetDMXFilter(input_thread_t * p_input, int i_pid, int *pi_fd, int i_type, unsigned int u_adapter, unsigned int u_device );
 int ioctl_UnsetDMXFilter(input_thread_t * p_input, int );
 int ioctl_InfoFrontend(input_thread_t * p_input, struct dvb_frontend_info *info, unsigned int u_adapter, unsigned int u_device );
 
+/*****************************************************************************
+ * dvb argument helper functions 
+ *****************************************************************************/
+fe_bandwidth_t dvb_DecodeBandwidth(input_thread_t * p_input, int bandwidth);
+fe_code_rate_t dvb_DecodeFEC(input_thread_t * p_input, int fec);
+fe_modulation_t dvb_DecodeModulation(input_thread_t * p_input, int modulation);
+fe_transmit_mode_t dvb_DecodeTransmission(input_thread_t * p_input, int transmission);
+fe_guard_interval_t dvb_DecodeGuardInterval(input_thread_t * p_input, int guard);
+fe_hierarchy_t dvb_DecodeHierarchy(input_thread_t * p_input, int hierarchy);
+fe_spectral_inversion_t dvb_DecodeInversion(input_thread_t * p_input, int inversion);

modules/access/dvb/qpsk.c

@@ -40,8 +40,9 @@ void E_(Close)   ( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 
+/* Satellite options */
 #define ADAPTER_TEXT N_("adapter card to tune")
-#define ADAPTER_LONGTEXT ""
+#define ADAPTER_LONGTEXT N_("adapter cards have a device file named /dev/dvb/adapter[n] with n>=0")
 
 #define DEVICE_TEXT N_("device nummer to use on adapter")
 #define DEVICE_LONGTEXT ""
@@ -53,7 +54,7 @@ void E_(Close)   ( vlc_object_t * );
 #define POL_LONGTEXT ""
 
 #define FEC_TEXT N_("satellite default transponder FEC")
-#define FEC_LONGTEXT ""
+#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode")
 
 #define SRATE_TEXT N_("satellite default transponder symbol rate")
 #define SRATE_LONGTEXT ""
@@ -73,6 +74,29 @@ void E_(Close)   ( vlc_object_t * );
 #define PROBE_TEXT	N_("probe the dvb card for capabilities (default disabled)")
 #define PROBE_LONGTEXT N_("some dvb cards do not like to be probed for their capabilities")
 
+/* Cable */
+#define MODULATION_TEXT N_("modulation type")
+#define MODULATION_LONGTEXT N_("modulation type for frontend device ")
+
+/* Terrestrial */
+#define CODE_RATE_HP_TEXT N_("terrestrial high priority stream code rate (FEC)")
+#define CODE_RATE_HP_LONGTEXT ""
+
+#define CODE_RATE_LP_TEXT N_("terrestrial low priority stream code rate (FEC)")
+#define CODE_RATE_LP_LONGTEXT ""
+
+#define BANDWIDTH_TEXT N_("terrestrial bandwidth")
+#define BANDWIDTH_LONGTEXT N_("terrestrial bandwidth [0=auto,6,7,8 in MHz]")
+
+#define GUARD_TEXT N_("terrestrial guard interval")
+#define GUARD_LONGTEXT ""
+
+#define TRANSMISSION_TEXT N_("terrestrial transmission mode")
+#define TRANSMISSION_LONGTEXT ""
+
+#define HIERARCHY_TEXT N_("terrestrial hierarchy mode")
+#define HIERARCHY_LONGTEXT ""
+
 vlc_module_begin();
     add_category_hint( N_("Input"), NULL, VLC_FALSE );
 			  add_integer( "adapter", 1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE );
@@ -89,12 +113,20 @@ vlc_module_begin();
         add_integer( "lnb-slof", 11700, NULL,
                      LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
 			  add_bool( "probe", 0, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_FALSE );
+	      add_integer( "code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, CODE_RATE_HP_LONGTEXT, VLC_FALSE );
+	      add_integer( "code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, CODE_RATE_LP_LONGTEXT, VLC_FALSE );
+			  add_integer( "bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, VLC_FALSE );
+			  add_integer( "modulation", 0, NULL, MODULATION_TEXT, MODULATION_LONGTEXT, VLC_FALSE );
+			  add_integer( "quard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
+			  add_integer( "transmission", 0, NULL, TRANSMISSION_TEXT, TRANSMISSION_LONGTEXT, VLC_TRUE );
+			  add_integer( "hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, VLC_TRUE );
     set_description( _("DVB input module with v4l2 support") );
     set_capability( "access", 0 );
 		add_shortcut( "qpsk" );
-//    add_shortcut( "cable" );
-//    add_shortcut( "terrestrial" );
+    add_shortcut( "cable" );
+    add_shortcut( "terrestrial" );
     add_shortcut( "dvb" );
+    add_shortcut( "satellite" );
     set_callbacks( E_(Open), E_(Close) );
 vlc_module_end();