/*****************************************************************************
* access.c: DVB card input v4l2 only
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
*
* Authors: Johan Bilien <jobi@via.ecp.fr>
* Jean-Paul Saman <jpsaman@wxs.nl>
#include <errno.h>
+/* Include dvbpsi headers */
+#ifdef HAVE_DVBPSI_DR_H
+# include <dvbpsi/dvbpsi.h>
+# include <dvbpsi/descriptor.h>
+# include <dvbpsi/pat.h>
+# include <dvbpsi/pmt.h>
+# include <dvbpsi/dr.h>
+# include <dvbpsi/psi.h>
+#else
+# include "dvbpsi.h"
+# include "descriptor.h"
+# include "tables/pat.h"
+# include "tables/pmt.h"
+# include "descriptors/dr.h"
+# include "psi.h"
+#endif
+
#include "dvb.h"
/*****************************************************************************
"Allows you to modify the default caching value for dvb streams. This " \
"value should be set in millisecond units." )
-#define PROGRAM_TEXT N_("Program to decode")
-#define PROGRAM_LONGTEXT N_("This is a workaround for a bug in the input")
-
#define ADAPTER_TEXT N_("Adapter card to tune")
#define ADAPTER_LONGTEXT N_("Adapter cards have a device file in directory named /dev/dvb/adapter[n] with n>=0.")
#define PROBE_TEXT N_("Probe DVB card for capabilities")
#define PROBE_LONGTEXT N_("Some DVB cards do not like to be probed for their capabilities.")
-#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
-#define LNB_LOF1_LONGTEXT ""
-
-#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
-#define LNB_LOF2_LONGTEXT ""
-
-#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
-#define LNB_SLOF_LONGTEXT ""
-
-/* Satellite */
#define BUDGET_TEXT N_("Budget mode")
#define BUDGET_LONGTEXT N_("This allows you to stream an entire transponder with a budget card.")
+/* Satellite */
#define SATNO_TEXT N_("Satellite number in the Diseqc system")
-#define SATNO_LONGTEXT N_("[0=no diseqc, 1-4=normal diseqc, -1=A, -2=B simple diseqc]")
+#define SATNO_LONGTEXT N_("[0=no diseqc, 1-4=satellite number]")
#define VOLTAGE_TEXT N_("LNB voltage")
#define VOLTAGE_LONGTEXT N_("In Volts [0, 13=vertical, 18=horizontal]")
+#define HIGH_VOLTAGE_TEXT N_("High LNB voltage")
+#define HIGH_VOLTAGE_LONGTEXT N_("Enable high voltage if your cables are " \
+ "particularly long. This is not supported by all frontends.")
+
#define TONE_TEXT N_("22 kHz tone")
#define TONE_LONGTEXT N_("[0=off, 1=on, -1=auto]")
#define SRATE_TEXT N_("Transponder symbol rate in kHz")
#define SRATE_LONGTEXT ""
+#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
+#define LNB_LOF1_LONGTEXT ""
+
+#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
+#define LNB_LOF2_LONGTEXT ""
+
+#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
+#define LNB_SLOF_LONGTEXT ""
+
/* Cable */
#define MODULATION_TEXT N_("Modulation type")
#define MODULATION_LONGTEXT N_("Modulation type for front-end device.")
vlc_module_begin();
set_shortname( _("DVB") );
set_description( N_("DVB input with v4l2 support") );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, VLC_TRUE );
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
VLC_TRUE );
add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE );
- add_integer( "dvb-lnb-lof1", 9750000, NULL, LNB_LOF1_TEXT,
- LNB_LOF1_LONGTEXT, VLC_TRUE );
- add_integer( "dvb-lnb-lof2", 10600000, NULL, LNB_LOF2_TEXT,
- LNB_LOF2_LONGTEXT, VLC_TRUE );
- add_integer( "dvb-lnb-slof", 11700000, NULL, LNB_SLOF_TEXT,
- LNB_SLOF_LONGTEXT, VLC_TRUE );
- /* DVB-S (satellite) */
add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
VLC_TRUE );
+ /* DVB-S (satellite) */
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
VLC_TRUE );
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
VLC_TRUE );
+ add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
+ HIGH_VOLTAGE_LONGTEXT, VLC_TRUE );
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
VLC_TRUE );
add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
VLC_FALSE );
- /* DVB-T (terrestrial) */
+ add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
+ LNB_LOF1_LONGTEXT, VLC_TRUE );
+ add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
+ LNB_LOF2_LONGTEXT, VLC_TRUE );
+ add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
+ LNB_SLOF_LONGTEXT, VLC_TRUE );
+ /* DVB-C (cable) */
add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
MODULATION_LONGTEXT, VLC_TRUE );
/* DVB-T (terrestrial) */
add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
VLC_TRUE );
- set_capability( "access", 0 );
+ set_capability( "access2", 0 );
add_shortcut( "dvb" );
add_shortcut( "dvb-s" );
add_shortcut( "qpsk" );
static block_t *Block( access_t * );
static int Control( access_t *, int, va_list );
-#define SATELLITE_READ_ONCE 3
+#define DVB_READ_ONCE 20
+#define DVB_READ_ONCE_START 2
#define TS_PACKET_SIZE 188
static void FilterUnset( access_t *, int i_max );
FilterSet( p_access, 0x0, OTHER_TYPE );
}
+ E_(CAMOpen)( p_access );
+
+ if( p_sys->b_budget_mode )
+ p_sys->i_read_once = DVB_READ_ONCE;
+ else
+ p_sys->i_read_once = DVB_READ_ONCE_START;
+
return VLC_SUCCESS;
}
E_(DVRClose)( p_access );
E_(FrontendClose)( p_access );
+ E_(CAMClose)( p_access );
+
free( p_sys );
}
static block_t *Block( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- struct timeval timeout;
- fd_set fds;
- int i_ret;
block_t *p_block;
- /* Initialize file descriptor set */
- FD_ZERO( &fds );
- FD_SET( p_sys->i_handle, &fds );
-
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
-
- /* Find if some data is available */
- while( (i_ret = select( p_sys->i_handle + 1, &fds, NULL, NULL, &timeout )) == 0 ||
- (i_ret < 0 && errno == EINTR) )
+ for ( ; ; )
{
+ struct timeval timeout;
+ fd_set fds, fde;
+ int i_ret;
+ int i_max_handle = p_sys->i_handle;
+
+ /* Initialize file descriptor sets */
FD_ZERO( &fds );
+ FD_ZERO( &fde );
FD_SET( p_sys->i_handle, &fds );
+ FD_SET( p_sys->i_frontend_handle, &fde );
+ if ( p_sys->i_frontend_handle > i_max_handle )
+ i_max_handle = p_sys->i_frontend_handle;
+
+ /* We'll wait 0.5 second if nothing happens */
timeout.tv_sec = 0;
timeout.tv_usec = 500000;
- if( p_access->b_die )
+ /* Find if some data is available */
+ i_ret = select( i_max_handle + 1, &fds, NULL, &fde, &timeout );
+
+ if ( p_access->b_die )
return NULL;
- }
- if ( i_ret < 0 )
- {
- msg_Err( p_access, "select error (%s)", strerror(errno) );
- return NULL;
- }
+ if ( i_ret < 0 && errno == EINTR )
+ continue;
- p_block = block_New( p_access, SATELLITE_READ_ONCE * TS_PACKET_SIZE );
- if( ( p_block->i_buffer = read( p_sys->i_handle, p_block->p_buffer, SATELLITE_READ_ONCE * TS_PACKET_SIZE ) ) <= 0 )
- {
- msg_Err( p_access, "read failed (%s)", strerror(errno) );
- block_Release( p_block );
- return NULL;
+ if ( i_ret < 0 )
+ {
+ msg_Err( p_access, "select error (%s)", strerror(errno) );
+ return NULL;
+ }
+
+ if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event )
+ {
+ E_(CAMPoll)( p_access );
+ p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout;
+ }
+
+ if ( FD_ISSET( p_sys->i_frontend_handle, &fde ) )
+ {
+ E_(FrontendPoll)( p_access );
+ }
+
+ if ( p_sys->i_frontend_timeout && mdate() > p_sys->i_frontend_timeout )
+ {
+ msg_Warn( p_access, "no lock, tuning again" );
+ E_(FrontendSet)( p_access );
+ }
+
+ if ( FD_ISSET( p_sys->i_handle, &fds ) )
+ {
+ p_block = block_New( p_access,
+ p_sys->i_read_once * TS_PACKET_SIZE );
+ if( ( p_block->i_buffer = read( p_sys->i_handle, p_block->p_buffer,
+ p_sys->i_read_once * TS_PACKET_SIZE ) ) <= 0 )
+ {
+ msg_Warn( p_access, "read failed (%s)", strerror(errno) );
+ block_Release( p_block );
+ continue;
+ }
+ break;
+ }
}
+ if( p_sys->i_read_once < DVB_READ_ONCE )
+ p_sys->i_read_once++;
+
return p_block;
}
/* */
case ACCESS_GET_MTU:
pi_int = (int*)va_arg( args, int * );
- *pi_int = SATELLITE_READ_ONCE * TS_PACKET_SIZE;
+ *pi_int = DVB_READ_ONCE * TS_PACKET_SIZE;
break;
case ACCESS_GET_PTS_DELAY:
return VLC_EGENERIC;
case ACCESS_SET_PRIVATE_ID_STATE:
- b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t ); /* b_selected */
i_int = (int)va_arg( args, int ); /* Private data (pid for now)*/
+ b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t ); /* b_selected */
if( !p_sys->b_budget_mode )
{
/* FIXME we may want to give the real type (me ?, I don't ;) */
}
break;
+ case ACCESS_SET_PRIVATE_ID_CA:
+ {
+ dvbpsi_pmt_t *p_pmt;
+
+ p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * );
+
+ E_(CAMSet)( p_access, p_pmt );
+ break;
+ }
+
default:
- msg_Err( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
}
p_sys->p_demux_handles[i].i_type = i_type;
p_sys->p_demux_handles[i].i_pid = i_pid;
+
+ if( p_sys->i_read_once < DVB_READ_ONCE )
+ p_sys->i_read_once++;
}
static void FilterUnset( access_t *p_access, int i_max )
var_Create( p_access, "dvb-frequency", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-inversion", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-probe", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-lof1", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-lof2", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-slof", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-budget-mode", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* */
- var_Create( p_access, "dvb-budget-mode", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-satno", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-voltage", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-high-voltage", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-tone", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-fec", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-srate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-lnb-lof1", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-lnb-lof2", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-lnb-slof", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
/* */
var_Create( p_access, "dvb-modulation", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
#define GET_OPTION_INT( option ) \
if ( !strncmp( psz_parser, option "=", strlen(option "=") ) ) \
{ \
- val.i_int = strtol( psz_parser+strlen(option "="), &psz_parser, 0 );\
- var_Set( p_access, "dvb-" option, val ); \
+ val.i_int = strtol( psz_parser + strlen(option "="), &psz_parser, \
+ 0 ); \
+ var_Set( p_access, "dvb-" option, val ); \
}
#define GET_OPTION_BOOL( option ) \
{ \
val.b_bool = strtol( psz_parser + strlen(option "="), &psz_parser, \
0 ); \
- var_Set( p_access, "dvb-" option, val ); \
+ var_Set( p_access, "dvb-" option, val ); \
}
/* Test for old syntax */
else GET_OPTION_INT("frequency")
else GET_OPTION_INT("inversion")
else GET_OPTION_BOOL("probe")
- else GET_OPTION_INT("lnb-lof1")
- else GET_OPTION_INT("lnb-lof2")
- else GET_OPTION_INT("lnb-slof")
-
else GET_OPTION_BOOL("budget-mode")
+
else GET_OPTION_INT("voltage")
+ else GET_OPTION_BOOL("high-voltage")
else GET_OPTION_INT("tone")
+ else GET_OPTION_INT("satno")
else GET_OPTION_INT("fec")
else GET_OPTION_INT("srate")
+ else GET_OPTION_INT("lnb-lof1")
+ else GET_OPTION_INT("lnb-lof2")
+ else GET_OPTION_INT("lnb-slof")
else GET_OPTION_INT("modulation")
else GET_OPTION_INT("guard")
else GET_OPTION_INT("hierarchy")
- else if( !strncmp( psz_parser, "satno=",
- strlen( "satno=" ) ) )
- {
- psz_parser += strlen( "satno=" );
- if ( *psz_parser == 'A' || *psz_parser == 'a' )
- val.i_int = -1;
- else if ( *psz_parser == 'B' || *psz_parser == 'b' )
- val.i_int = -2;
- else
- val.i_int = strtol( psz_parser, &psz_parser, 0 );
- var_Set( p_access, "dvb-satno", val );
- }
/* Redundant with voltage but much easier to use */
else if( !strncmp( psz_parser, "polarization=",
strlen( "polarization=" ) ) )
return VLC_EGENERIC;
}
- psz_parser++;
+ if ( *psz_parser )
+ psz_parser++;
}
#undef GET_OPTION_INT
#undef GET_OPTION_BOOL
projects / vlc / blobdiff