X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvb%2Faccess.c;h=d08a7a2dedfd530eca44e4af136b0076acc245d9;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=d2ad600a40bb43fd338a8ee3d576e815748e5c94;hpb=5b67f077c2e00208e514f0f0d5dc0da3a2e7e91e;p=vlc diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index d2ad600a40..d08a7a2ded 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -1,11 +1,12 @@ /***************************************************************************** * access.c: DVB card input v4l2 only ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN + * Copyright (C) 1998-2005 the VideoLAN team * * Authors: Johan Bilien - * Jean-Paul Saman + * Jean-Paul Saman * Christophe Massiot + * Laurent Aimar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,20 +20,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include - #include -#include - -#include "../../demux/mpeg/system.h" +#include +#include #ifdef HAVE_UNISTD_H # include @@ -40,44 +37,43 @@ #include #include - -#ifdef HAVE_ERRNO_H -# include -# include +#include + +#include + +/* Include dvbpsi headers */ +#ifdef HAVE_DVBPSI_DR_H +# include +# include +# include +# include +# include +# include +#else +# include "dvbpsi.h" +# include "descriptor.h" +# include "tables/pat.h" +# include "tables/pmt.h" +# include "descriptors/dr.h" +# include "psi.h" #endif -#ifdef STRNCASECMP_IN_STRINGS_H -# include +#ifdef ENABLE_HTTPD +# include "vlc_httpd.h" #endif #include "dvb.h" -#define SATELLITE_READ_ONCE 3 - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Open( vlc_object_t *p_this ); -static void Close( vlc_object_t *p_this ); -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len); -static int SetArea ( input_thread_t *, input_area_t * ); -static int SetProgram ( input_thread_t *, pgrm_descriptor_t * ); -static void Seek ( input_thread_t *, off_t ); -static void AllocateDemux( input_thread_t * p_input, int i_pid, - int i_type ); -static void CloseProgram( input_thread_t * p_input ); - /***************************************************************************** * Module descriptor *****************************************************************************/ +static int Open( vlc_object_t *p_this ); +static void Close( vlc_object_t *p_this ); + #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "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") + "Caching value for DVB streams. This " \ + "value should be set in milliseconds." ) #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.") @@ -92,36 +88,40 @@ static void CloseProgram( input_thread_t * p_input ); #define INVERSION_LONGTEXT N_("Inversion mode [0=off, 1=on, 2=auto]") #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 PROBE_LONGTEXT N_("Some DVB cards do not like to be probed for their capabilities, you can disable this feature if you experience some trouble.") -#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. Budget mode is compatible with the ts2 demux.") +#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 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 TONE_LONGTEXT N_("[0=off, 1=on, -1=auto].") #define FEC_TEXT N_("Transponder FEC") -#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode [9=auto]") +#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode [9=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.") @@ -145,9 +145,45 @@ static void CloseProgram( input_thread_t * p_input ); #define HIERARCHY_TEXT N_("Terrestrial hierarchy mode") #define HIERARCHY_LONGTEXT "" +#define HOST_TEXT N_( "HTTP Host address" ) +#define HOST_LONGTEXT N_( \ + "To enable the internal HTTP server, set its address and port here." ) + +#define USER_TEXT N_( "HTTP user name" ) +#define USER_LONGTEXT N_( \ + "User name the administrator will use to log into " \ + "the internal HTTP server." ) + +#define PASSWORD_TEXT N_( "HTTP password" ) +#define PASSWORD_LONGTEXT N_( \ + "Password the administrator will use to log into " \ + "the internal HTTP server." ) + +#define ACL_TEXT N_( "HTTP ACL" ) +#define ACL_LONGTEXT N_( \ + "Access control list (equivalent to .hosts) file path, " \ + "which will limit the range of IPs entitled to log into the internal " \ + "HTTP server." ) + +#define CERT_TEXT N_( "Certificate file" ) +#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \ + "(enables SSL)" ) + +#define KEY_TEXT N_( "Private key file" ) +#define KEY_LONGTEXT N_( "HTTP interface x509 PEM private key file" ) + +#define CA_TEXT N_( "Root CA file" ) +#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA " \ + "certificates file" ) + +#define CRL_TEXT N_( "CRL file" ) +#define CRL_LONGTEXT N_( "HTTP interface Certificates Revocation List file" ) + vlc_module_begin(); set_shortname( _("DVB") ); - set_description( N_("DVB input with v4l2 support") ); + set_description( _("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 ); @@ -160,25 +196,27 @@ vlc_module_begin(); 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) */ @@ -193,231 +231,153 @@ vlc_module_begin(); TRANSMISSION_LONGTEXT, VLC_TRUE ); add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, VLC_TRUE ); +#ifdef ENABLE_HTTPD + /* MMI HTTP interface */ + set_section( N_("HTTP server" ), 0 ); + add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT, + PASSWORD_LONGTEXT, VLC_TRUE ); + add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, + VLC_TRUE ); + add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, + VLC_TRUE ); +#endif + + set_capability( "access2", 0 ); + add_shortcut( "dvb" ); /* Generic name */ - set_capability( "access", 0 ); - add_shortcut( "dvb" ); - add_shortcut( "dvb-s" ); + add_shortcut( "dvb-s" ); /* Satellite */ add_shortcut( "qpsk" ); - add_shortcut( "dvb-c" ); + add_shortcut( "satellite" ); + + add_shortcut( "dvb-c" ); /* Cable */ add_shortcut( "cable" ); - add_shortcut( "dvb-t" ); + + add_shortcut( "dvb-t" ); /* Terrestrial */ add_shortcut( "terrestrial" ); - add_shortcut( "satellite" ); /* compatibility with the interface. */ + + add_shortcut( "atsc" ); /* Atsc */ + add_shortcut( "usdigital" ); + set_callbacks( Open, Close ); vlc_module_end(); + /***************************************************************************** - * Open: open the frontend device + * Local prototypes *****************************************************************************/ -#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_input, "dvb-" option, val ); \ - } +static block_t *Block( access_t * ); +static int Control( access_t *, int, va_list ); -#define GET_OPTION_BOOL( option ) \ - if ( !strncmp( psz_parser, option "=", strlen(option "=") ) ) \ - { \ - val.b_bool = strtol( psz_parser + strlen(option "="), &psz_parser, \ - 0 ); \ - var_Set( p_input, "dvb-" option, val ); \ - } +#define DVB_READ_ONCE 20 +#define DVB_READ_ONCE_START 2 +#define TS_PACKET_SIZE 188 -static int Open( vlc_object_t *p_this ) -{ - input_thread_t * p_input = (input_thread_t *)p_this; - thread_dvb_data_t * p_dvb; - char * psz_parser; - char * psz_next; - vlc_value_t val; - int i_test; +static void FilterUnset( access_t *, int i_max ); +static void FilterUnsetPID( access_t *, int i_pid ); +static void FilterSet( access_t *, int i_pid, int i_type ); - /* Initialize structure */ - p_dvb = (thread_dvb_data_t *)malloc( sizeof( thread_dvb_data_t ) ); - if( p_dvb == NULL ) - { - msg_Err( p_input, "out of memory" ); - return -1; - } - memset( p_dvb, 0, sizeof(thread_dvb_data_t) ); - p_input->p_access_data = (void *)p_dvb; +static void VarInit( access_t * ); +static int ParseMRL( access_t * ); - /* Register callback functions */ - p_input->pf_read = Read; - p_input->pf_set_program = SetProgram; - p_input->pf_set_area = SetArea; - p_input->pf_seek = Seek; - /* Parse the options passed in command line */ - - psz_parser = strdup( p_input->psz_name ); - if ( !psz_parser ) - { - free( p_dvb ); - return( -1 ); - } - - var_Create( p_input, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "dvb-caching", &val ); - p_input->i_pts_delay = val.i_int * 1000; - - var_Create( p_input, "dvb-adapter", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-frequency", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-inversion", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-probe", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-lnb-lof1", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-lnb-lof2", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-lnb-slof", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - var_Create( p_input, "dvb-budget-mode", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-satno", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-voltage", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-tone", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-fec", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-srate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - var_Create( p_input, "dvb-modulation", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - var_Create( p_input, "dvb-code-rate-hp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-code-rate-lp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-bandwidth", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-transmission", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-guard", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "dvb-hierarchy", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - i_test = strtol( psz_parser, &psz_next, 10 ); - if ( psz_next == psz_parser ) - { - for ( ; ; ) - { - GET_OPTION_INT("adapter") - else GET_OPTION_INT("device") - 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_INT("tone") - else GET_OPTION_INT("fec") - else GET_OPTION_INT("srate") - - else GET_OPTION_INT("modulation") - - else GET_OPTION_INT("code-rate-hp") - else GET_OPTION_INT("code-rate-lp") - else GET_OPTION_INT("bandwidth") - else GET_OPTION_INT("transmission") - 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_input, "dvb-satno", val ); - } - /* Redundant with voltage but much easier to use */ - else if( !strncmp( psz_parser, "polarization=", - strlen( "polarization=" ) ) ) - { - psz_parser += strlen( "polarization=" ); - if ( *psz_parser == 'V' || *psz_parser == 'v' ) - val.i_int = 13; - else if ( *psz_parser == 'H' || *psz_parser == 'h' ) - val.i_int = 18; - else - { - msg_Err( p_input, "illegal polarization %c", *psz_parser ); - free( p_dvb ); - return -1; - } - var_Set( p_input, "dvb-voltage", val ); - } - if ( *psz_parser ) - psz_parser++; - else - break; - } - } - else +/***************************************************************************** + * Open: open the frontend device + *****************************************************************************/ +static int Open( vlc_object_t *p_this ) +{ + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; + + /* Only if selected */ + if( *p_access->psz_access == '\0' ) + return VLC_EGENERIC; + + /* Set up access */ + p_access->pf_read = NULL; + p_access->pf_block = Block; + p_access->pf_control = Control; + p_access->pf_seek = NULL; + p_access->info.i_update = 0; + p_access->info.i_size = 0; + p_access->info.i_pos = 0; + p_access->info.b_eof = VLC_FALSE; + p_access->info.i_title = 0; + p_access->info.i_seekpoint = 0; + + p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; + + memset( p_sys, 0, sizeof( access_sys_t ) ); + + /* Create all variables */ + VarInit( p_access ); + + /* Parse the command line */ + if( ParseMRL( p_access ) ) { - msg_Err( p_input, "the DVB input old syntax is deprecated, use vlc " \ - "-p dvb to see an explanation of the new syntax" ); - free( p_dvb ); - return -1; + free( p_sys ); + return VLC_EGENERIC; } /* Getting frontend info */ - if ( E_(FrontendOpen)( p_input ) < 0 ) + if( E_(FrontendOpen)( p_access) ) { - free( p_dvb ); - return -1; + free( p_sys ); + return VLC_EGENERIC; } - /* Setting frontend parameters for tuning the hardware */ - msg_Dbg( p_input, "trying to tune the frontend..."); - if ( E_(FrontendSet)( p_input ) < 0 ) + /* Setting frontend parameters for tuning the hardware */ + msg_Dbg( p_access, "trying to tune the frontend..."); + if( E_(FrontendSet)( p_access ) < 0 ) { - E_(FrontendClose)( p_input ); - free( p_dvb ); - return -1; + E_(FrontendClose)( p_access ); + free( p_sys ); + return VLC_EGENERIC; } - /* Opening DVR device */ - if ( E_(DVROpen)( p_input ) < 0 ) + /* Opening DVR device */ + if( E_(DVROpen)( p_access ) < 0 ) { - E_(FrontendClose)( p_input ); - free( p_dvb ); - return -1; + E_(FrontendClose)( p_access ); + free( p_sys ); + return VLC_EGENERIC; } - var_Get( p_input, "dvb-budget-mode", &val ); - p_dvb->b_budget_mode = val.b_bool; - if ( val.b_bool ) + p_sys->b_budget_mode = var_GetBool( p_access, "dvb-budget-mode" ); + if( p_sys->b_budget_mode ) { - msg_Dbg( p_input, "setting filter on all PIDs" ); - AllocateDemux( p_input, 0x2000, OTHER_TYPE ); + msg_Dbg( p_access, "setting filter on all PIDs" ); + FilterSet( p_access, 0x2000, OTHER_TYPE ); } else { - msg_Dbg( p_input, "setting filter on PAT" ); - AllocateDemux( p_input, 0x0, OTHER_TYPE ); - } - - if( input_InitStream( p_input, sizeof( stream_ts_data_t ) ) == -1 ) - { - msg_Err( p_input, "could not initialize stream structure" ); - E_(FrontendClose)( p_input ); - close( p_dvb->i_handle ); - free( p_dvb ); - return( -1 ); + msg_Dbg( p_access, "setting filter on PAT" ); + FilterSet( p_access, 0x0, OTHER_TYPE ); } - vlc_mutex_lock( &p_input->stream.stream_lock ); + E_(CAMOpen)( p_access ); - p_input->stream.b_pace_control = 0; - p_input->stream.b_seekable = 0; - p_input->stream.p_selected_area->i_tell = 0; - - vlc_mutex_unlock( &p_input->stream.stream_lock ); + if( p_sys->b_budget_mode ) + p_sys->i_read_once = DVB_READ_ONCE; + else + p_sys->i_read_once = DVB_READ_ONCE_START; - p_input->i_mtu = SATELLITE_READ_ONCE * TS_PACKET_SIZE; - p_input->stream.i_method = INPUT_METHOD_SATELLITE; +#ifdef ENABLE_HTTPD + E_(HTTPOpen)( p_access ); +#endif - return 0; + return VLC_SUCCESS; } /***************************************************************************** @@ -425,261 +385,413 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t *p_this ) { - input_thread_t * p_input = (input_thread_t *)p_this; - thread_dvb_data_t * p_dvb = (thread_dvb_data_t *)p_input->p_access_data; + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys = p_access->p_sys; - if ( !p_dvb->b_budget_mode ) - { - CloseProgram( p_input ); - } - if ( p_dvb->p_demux_handles[0].i_type ) - { - E_(DMXUnsetFilter)( p_input, p_dvb->p_demux_handles[0].i_handle ); - p_dvb->p_demux_handles[0].i_type = 0; - } - E_(DVRClose)( p_input ); - E_(FrontendClose)( p_input ); - free( p_dvb ); + FilterUnset( p_access, p_sys->b_budget_mode ? 1 : MAX_DEMUX ); + + E_(DVRClose)( p_access ); + E_(FrontendClose)( p_access ); + E_(CAMClose)( p_access ); + +#ifdef ENABLE_HTTPD + E_(HTTPClose)( p_access ); +#endif + + free( p_sys ); } /***************************************************************************** - * Read: reads data from the satellite card + * Block: *****************************************************************************/ -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *Block( access_t *p_access ) { - thread_dvb_data_t * p_dvb = (thread_dvb_data_t *)p_input->p_access_data; - ssize_t i_ret; - vlc_value_t val; - struct timeval timeout; - fd_set fds; + access_sys_t *p_sys = p_access->p_sys; + block_t *p_block; - if ( !p_dvb->b_budget_mode && !p_dvb->p_demux_handles[1].i_type ) + for ( ; ; ) { - int i_program; - unsigned int i; - var_Get( p_input, "program", &val ); - i_program = val.i_int; + struct pollfd ufds[2]; + int i_ret; + + /* Initialize file descriptor sets */ + memset (ufds, 0, sizeof (ufds)); + ufds[0].fd = p_sys->i_handle; + ufds[0].events = POLLIN; + ufds[1].fd = p_sys->i_frontend_handle; + ufds[1].events = POLLPRI; + + /* We'll wait 0.5 second if nothing happens */ + /* Find if some data is available */ + i_ret = poll( ufds, 2, 500 ); + + if ( p_access->b_die ) + return NULL; - /* FIXME : this is not demux2-compatible */ - for ( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + if ( i_ret < 0 ) { - /* Only set a filter on the selected program : some boards - * (read: Dreambox) only have 8 filters, so you don't want to - * spend them on unwanted PMTs. --Meuuh */ - if ( !i_program - || p_input->stream.pp_programs[i]->i_number == i_program ) - { - msg_Dbg( p_input, "setting filter on PMT pid %d", - p_input->stream.pp_programs[i]->pp_es[0]->i_id ); - AllocateDemux( p_input, - p_input->stream.pp_programs[i]->pp_es[0]->i_id, - OTHER_TYPE ); - } - } - } + if( errno == EINTR ) + continue; - /* Find if some data is available. This won't work under Windows. */ + msg_Err( p_access, "poll error: %s", strerror(errno) ); + return NULL; + } - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( p_dvb->i_handle, &fds ); + 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; + } - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + if ( ufds[1].revents ) + { + E_(FrontendPoll)( p_access ); + } - /* Find if some data is available */ - while ( (i_ret = select( p_dvb->i_handle + 1, &fds, - NULL, NULL, &timeout )) == 0 - || (i_ret < 0 && errno == EINTR) ) - { - FD_ZERO( &fds ); - FD_SET( p_dvb->i_handle, &fds ); - timeout.tv_sec = 0; - timeout.tv_usec = 500000; +#ifdef ENABLE_HTTPD + if ( p_sys->i_httpd_timeout && mdate() > p_sys->i_httpd_timeout ) + { + vlc_mutex_lock( &p_sys->httpd_mutex ); + if ( p_sys->b_request_frontend_info ) + { + msg_Warn( p_access, "frontend timeout for HTTP interface" ); + p_sys->b_request_frontend_info = VLC_FALSE; + p_sys->psz_frontend_info = strdup( "Timeout getting info\n" ); + } + if ( p_sys->b_request_mmi_info ) + { + msg_Warn( p_access, "MMI timeout for HTTP interface" ); + p_sys->b_request_mmi_info = VLC_FALSE; + p_sys->psz_mmi_info = strdup( "Timeout getting info\n" ); + } + vlc_cond_signal( &p_sys->httpd_cond ); + vlc_mutex_unlock( &p_sys->httpd_mutex ); + } - if ( p_input->b_die || p_input->b_error ) + if ( p_sys->b_request_frontend_info ) { - return 0; + E_(FrontendStatus)( p_access ); } - } - if ( i_ret < 0 ) - { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "select error (%s)", strerror(errno) ); -#else - msg_Err( p_input, "select error" ); + if ( p_sys->b_request_mmi_info ) + { + E_(CAMStatus)( p_access ); + } #endif - return -1; - } - i_ret = read( p_dvb->i_handle, p_buffer, i_len ); - - if( i_ret < 0 ) - { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "read failed (%s)", strerror(errno) ); -#else - msg_Err( p_input, "read failed" ); -#endif + 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 ( ufds[0].revents ) + { + 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; + } } - return i_ret; -} + if( p_sys->i_read_once < DVB_READ_ONCE ) + p_sys->i_read_once++; -/***************************************************************************** - * SetArea : Does nothing - *****************************************************************************/ -static int SetArea( input_thread_t * p_input, input_area_t * p_area ) -{ - return -1; + return p_block; } /***************************************************************************** - * SetProgram : Sets the card filters according to the selected program, - * and makes the appropriate changes to stream structure. + * Control: *****************************************************************************/ -static int SetProgram( input_thread_t * p_input, - pgrm_descriptor_t * p_new_prg ) +static int Control( access_t *p_access, int i_query, va_list args ) { - thread_dvb_data_t * p_dvb = (thread_dvb_data_t *)p_input->p_access_data; - unsigned int i_es_index; - vlc_value_t val; - int i_video_type = VIDEO0_TYPE; - int i_audio_type = AUDIO0_TYPE; + access_sys_t *p_sys = p_access->p_sys; + vlc_bool_t *pb_bool, b_bool; + int *pi_int, i_int; + int64_t *pi_64; - if ( p_input->stream.p_selected_program ) + switch( i_query ) { - for ( i_es_index = 0; /* 0 should be the PMT */ - i_es_index < p_input->stream.p_selected_program->i_es_number; - i_es_index ++ ) - { -#define p_es p_input->stream.p_selected_program->pp_es[i_es_index] - if ( p_es->p_dec ) - { - input_UnselectES( p_input , p_es ); - } -#undef p_es - } - } + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = VLC_FALSE; + break; + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = DVB_READ_ONCE * TS_PACKET_SIZE; + break; - if ( !p_dvb->b_budget_mode ) - { - msg_Dbg( p_input, "unsetting filters on all pids" ); - CloseProgram( p_input ); - msg_Dbg( p_input, "setting filter on PMT pid %d", - p_new_prg->pp_es[0]->i_id ); - AllocateDemux( p_input, p_new_prg->pp_es[0]->i_id, OTHER_TYPE ); - } + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000; + break; - for ( i_es_index = 1; i_es_index < p_new_prg->i_es_number; - i_es_index++ ) - { -#define p_es p_new_prg->pp_es[i_es_index] - switch( p_es->i_cat ) - { - case VIDEO_ES: - if ( !p_dvb->b_budget_mode ) + /* */ + case ACCESS_SET_PAUSE_STATE: + case ACCESS_GET_TITLE_INFO: + case ACCESS_SET_TITLE: + case ACCESS_SET_SEEKPOINT: + return VLC_EGENERIC; + + case ACCESS_SET_PRIVATE_ID_STATE: + 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 ) { - msg_Dbg(p_input, "setting filter on video ES 0x%x", - p_es->i_id); - /* Always set the filter. This may seem a little odd, but - * it allows you to stream the video with demuxstream - * without having a decoder or a stream output behind. - * The result is you'll sometimes filter a PID which you - * don't really want, but in the most common cases it - * should be OK. --Meuuh */ - AllocateDemux( p_input, p_es->i_id, i_video_type ); - i_video_type += TYPE_INTERVAL; + /* FIXME we may want to give the real type (me ?, I don't ;) */ + if( b_bool ) + FilterSet( p_access, i_int, OTHER_TYPE ); + else + FilterUnsetPID( p_access, i_int ); } - input_SelectES( p_input, p_es ); break; - case AUDIO_ES: - if ( !p_dvb->b_budget_mode ) - { - msg_Dbg(p_input, "setting filter on audio ES 0x%x", - p_es->i_id); - AllocateDemux( p_input, p_es->i_id, i_audio_type ); - i_audio_type += TYPE_INTERVAL; - } - input_SelectES( p_input, p_es ); + 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: - if ( !p_dvb->b_budget_mode ) - { - msg_Dbg(p_input, "setting filter on other ES 0x%x", - p_es->i_id); - AllocateDemux( p_input, p_es->i_id, OTHER_TYPE ); - } - input_SelectES( p_input, p_es ); + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; + + } + return VLC_SUCCESS; +} + +/***************************************************************************** + * FilterSet/FilterUnset: + *****************************************************************************/ +static void FilterSet( access_t *p_access, int i_pid, int i_type ) +{ + access_sys_t *p_sys = p_access->p_sys; + int i; + + /* Find first free slot */ + for( i = 0; i < MAX_DEMUX; i++ ) + { + if( !p_sys->p_demux_handles[i].i_type ) break; - } -#undef p_es + + if( p_sys->p_demux_handles[i].i_pid == i_pid ) + return; /* Already set */ } - p_input->stream.p_selected_program = p_new_prg; + if( i >= MAX_DEMUX ) + { + msg_Err( p_access, "no free p_demux_handles !" ); + return; + } - /* 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 ); + if( E_(DMXSetFilter)( p_access, i_pid, + &p_sys->p_demux_handles[i].i_handle, i_type ) ) + { + msg_Err( p_access, "DMXSetFilter failed" ); + return; + } + p_sys->p_demux_handles[i].i_type = i_type; + p_sys->p_demux_handles[i].i_pid = i_pid; - return 0; + if( p_sys->i_read_once < DVB_READ_ONCE ) + p_sys->i_read_once++; } -/***************************************************************************** - * Seek: does nothing (not a seekable stream - *****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_off ) +static void FilterUnset( access_t *p_access, int i_max ) { - ; + access_sys_t *p_sys = p_access->p_sys; + int i; + + for( i = 0; i < i_max; i++ ) + { + if( p_sys->p_demux_handles[i].i_type ) + { + E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle ); + p_sys->p_demux_handles[i].i_type = 0; + } + } } -/***************************************************************************** - * AllocateDemux: - *****************************************************************************/ -static void AllocateDemux( input_thread_t * p_input, int i_pid, - int i_type ) +static void FilterUnsetPID( access_t *p_access, int i_pid ) { - thread_dvb_data_t * p_dvb = (thread_dvb_data_t *)p_input->p_access_data; - int i; + access_sys_t *p_sys = p_access->p_sys; + int i; - /* Find first free slot */ - for ( i = 0; i < MAX_DEMUX; i++ ) + for( i = 0; i < MAX_DEMUX; i++ ) { - if ( !p_dvb->p_demux_handles[i].i_type ) + if( p_sys->p_demux_handles[i].i_type && + p_sys->p_demux_handles[i].i_pid == i_pid ) { - if ( E_(DMXSetFilter)( p_input, i_pid, - &p_dvb->p_demux_handles[i].i_handle, - i_type ) < 0 ) - { - break; - } - p_dvb->p_demux_handles[i].i_type = i_type; - p_dvb->p_demux_handles[i].i_pid = i_pid; - break; + E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle ); + p_sys->p_demux_handles[i].i_type = 0; } } } /***************************************************************************** - * CloseProgram: + * VarInit/ParseMRL: *****************************************************************************/ -static void CloseProgram( input_thread_t * p_input ) +static void VarInit( access_t *p_access ) { - thread_dvb_data_t * p_dvb = (thread_dvb_data_t *)p_input->p_access_data; - int i; + /* */ + var_Create( p_access, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + + /* */ + var_Create( p_access, "dvb-adapter", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + 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-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 ); + + /* */ + var_Create( p_access, "dvb-code-rate-hp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-code-rate-lp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-bandwidth", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-transmission", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-guard", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-hierarchy", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + +#ifdef ENABLE_HTTPD + var_Create( p_access, "dvb-http-host", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-password", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-acl", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-intf-cert", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-intf-key", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-intf-ca", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-http-intf-crl", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); +#endif +} - for ( i = 1; i < MAX_DEMUX; i++ ) +/* */ +static int ParseMRL( access_t *p_access ) +{ + char *psz_dup = strdup( p_access->psz_path ); + char *psz_parser = psz_dup; + char *psz_next; + vlc_value_t val; + +#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 ); \ + } + +#define GET_OPTION_BOOL( option ) \ + if ( !strncmp( psz_parser, option "=", strlen(option "=") ) ) \ + { \ + val.b_bool = strtol( psz_parser + strlen(option "="), &psz_parser, \ + 0 ); \ + var_Set( p_access, "dvb-" option, val ); \ + } + + /* Test for old syntax */ + strtol( psz_parser, &psz_next, 10 ); + if( psz_next != psz_parser ) { - if ( p_dvb->p_demux_handles[i].i_type ) + msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc " + "-p dvb to see an explanation of the new syntax" ); + intf_UserFatal( p_access, VLC_TRUE, _("Input syntax is deprecated"), + _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \ + "explanation of the new syntax.") ); + free( psz_dup ); + return VLC_EGENERIC; + } + + while( *psz_parser ) + { + GET_OPTION_INT("adapter") + else GET_OPTION_INT("device") + else GET_OPTION_INT("frequency") + else GET_OPTION_INT("inversion") + else GET_OPTION_BOOL("probe") + 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("code-rate-hp") + else GET_OPTION_INT("code-rate-lp") + else GET_OPTION_INT("bandwidth") + else GET_OPTION_INT("transmission") + else GET_OPTION_INT("guard") + else GET_OPTION_INT("hierarchy") + + /* Redundant with voltage but much easier to use */ + else if( !strncmp( psz_parser, "polarization=", + strlen( "polarization=" ) ) ) + { + psz_parser += strlen( "polarization=" ); + if ( *psz_parser == 'V' || *psz_parser == 'v' ) + val.i_int = 13; + else if ( *psz_parser == 'H' || *psz_parser == 'h' ) + val.i_int = 18; + else + { + msg_Err( p_access, "illegal polarization %c", *psz_parser ); + intf_UserFatal( p_access, VLC_FALSE, _("Illegal Polarization"), + _("The provided polarization \"%c\" is not valid."), + *psz_parser ); + free( psz_dup ); + return VLC_EGENERIC; + } + var_Set( p_access, "dvb-voltage", val ); + } + else { - E_(DMXUnsetFilter)( p_input, p_dvb->p_demux_handles[i].i_handle ); - p_dvb->p_demux_handles[i].i_type = 0; + msg_Err( p_access, "unknown option (%s)", psz_parser ); + free( psz_dup ); + return VLC_EGENERIC; } + + if ( *psz_parser ) + psz_parser++; } -} +#undef GET_OPTION_INT +#undef GET_OPTION_BOOL + free( psz_dup ); + return VLC_SUCCESS; +}