X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvb%2Faccess.c;h=8bda64edb54e4e1de8d3d167802d6d328cea9cb1;hb=6656584f494fc78947842c574ff36d7168980396;hp=c716d2feb9a8828e015412f8bbde8f444f92b4bb;hpb=9502edb750c429b9b76c925ae5ee5b71572cf1eb;p=vlc diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index c716d2feb9..8bda64edb5 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -1,12 +1,13 @@ /***************************************************************************** * access.c: DVB card input v4l2 only ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2010 the VideoLAN team * * Authors: Johan Bilien - * Jean-Paul Saman + * Jean-Paul Saman * Christophe Massiot * Laurent Aimar + * David Kaplan * * 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 @@ -18,45 +19,41 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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., + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include - -#ifdef HAVE_UNISTD_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#include +#include +#include +#include +#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 +# include +# include +# include +# include +# include +# include +# include +# include #include "dvb.h" +#include "scan.h" /***************************************************************************** * Module descriptor @@ -64,165 +61,57 @@ 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 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 DEVICE_TEXT N_("Device number to use on adapter") -#define DEVICE_LONGTEXT "" - -#define FREQ_TEXT N_("Transponder/multiplex frequency") -#define FREQ_LONGTEXT N_("In kHz for DVB-S or Hz for DVB-C/T") - -#define INVERSION_TEXT N_("Inversion mode") -#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 BUDGET_TEXT N_("Budget mode") -#define BUDGET_LONGTEXT N_("This allows you to stream an entire transponder with a budget card.") +#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.") /* Satellite */ -#define SATNO_TEXT N_("Satellite number in the Diseqc system") -#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 FEC_TEXT N_("Transponder FEC") -#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 "" +#define SATELLITE_TEXT N_("Satellite scanning config") +#define SATELLITE_LONGTEXT N_("filename of config file in share/dvb/dvb-s") -/* Cable */ -#define MODULATION_TEXT N_("Modulation type") -#define MODULATION_LONGTEXT N_("Modulation type for front-end device.") +vlc_module_begin () + set_shortname( N_("DVB") ) + set_description( N_("DVB input with v4l2 support") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) -/* 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 "" + add_bool( "dvb-probe", true, PROBE_TEXT, PROBE_LONGTEXT, true ) + /* DVB-S (satellite) */ + add_string( "dvb-satellite", NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT, + true ) -#define TRANSMISSION_TEXT N_("Terrestrial transmission mode") -#define TRANSMISSION_LONGTEXT "" + set_capability( "access", 0 ) + add_shortcut( "dvb", /* Generic name */ + "dvb-s", "qpsk", "satellite", /* Satellite */ + "dvb-c", "cable", /* Cable */ + "dvb-t", "terrestrial" ) /* Terrestrial */ -#define HIERARCHY_TEXT N_("Terrestrial hierarchy mode") -#define HIERARCHY_LONGTEXT "" + set_callbacks( Open, Close ) -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-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, - VLC_FALSE ); - add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - VLC_TRUE ); - add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT, - VLC_FALSE ); - 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_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 ); - 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-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, - CODE_RATE_HP_LONGTEXT, VLC_TRUE ); - add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, - CODE_RATE_LP_LONGTEXT, VLC_TRUE ); - add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, - VLC_TRUE ); - add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE ); - add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT, - TRANSMISSION_LONGTEXT, VLC_TRUE ); - add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, - VLC_TRUE ); - - set_capability( "access2", 0 ); - add_shortcut( "dvb" ); - add_shortcut( "dvb-s" ); - add_shortcut( "qpsk" ); - add_shortcut( "dvb-c" ); - add_shortcut( "cable" ); - add_shortcut( "dvb-t" ); - add_shortcut( "terrestrial" ); - add_shortcut( "satellite" ); /* compatibility with the interface. */ - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -static block_t *Block( access_t * ); static int Control( access_t *, int, va_list ); +static block_t *BlockScan( access_t * ); + #define DVB_READ_ONCE 20 #define DVB_READ_ONCE_START 2 +#define DVB_READ_ONCE_SCAN 1 #define TS_PACKET_SIZE 188 +#define DVB_SCAN_MAX_SIGNAL_TIME (1000*1000) +#define DVB_SCAN_MAX_LOCK_TIME (5000*1000) +#define DVB_SCAN_MAX_PROBE_TIME (45000*1000) + 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 ); static void VarInit( access_t * ); static int ParseMRL( access_t * ); - /***************************************************************************** * Open: open the frontend device *****************************************************************************/ @@ -235,20 +124,9 @@ static int Open( vlc_object_t *p_this ) 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 ) ); - memset( p_sys, 0, sizeof( access_sys_t ) ); + p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; /* Create all variables */ VarInit( p_access ); @@ -257,51 +135,64 @@ static int Open( vlc_object_t *p_this ) if( ParseMRL( p_access ) ) { free( p_sys ); + var_Destroy( p_access, "dvb-modulation" ); + var_Destroy( p_access, "dvb-fec" ); + var_Destroy( p_access, "dvb-code-rate-hp" ); + var_Destroy( p_access, "dvb-code-rate-lp" ); + var_Destroy( p_access, "dvb-guard" ); return VLC_EGENERIC; } - /* Getting frontend info */ - if( E_(FrontendOpen)( p_access) ) + bool b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0; + if( b_scan_mode ) { - free( p_sys ); - return VLC_EGENERIC; + msg_Dbg( p_access, "DVB scan mode selected" ); + p_access->pf_block = BlockScan; } + else + return VLC_EGENERIC; /* let the DTV plugin do the work */ - /* Setting frontend parameters for tuning the hardware */ - msg_Dbg( p_access, "trying to tune the frontend..."); - if( E_(FrontendSet)( p_access ) < 0 ) + /* Getting frontend info */ + if( FrontendOpen( p_access) ) { - E_(FrontendClose)( p_access ); free( p_sys ); return VLC_EGENERIC; } /* Opening DVR device */ - if( E_(DVROpen)( p_access ) < 0 ) + if( DVROpen( p_access ) < 0 ) { - E_(FrontendClose)( p_access ); + FrontendClose( p_access ); free( p_sys ); return VLC_EGENERIC; } - p_sys->b_budget_mode = var_GetBool( p_access, "dvb-budget-mode" ); - if( p_sys->b_budget_mode ) { - msg_Dbg( p_access, "setting filter on all PIDs" ); - FilterSet( p_access, 0x2000, OTHER_TYPE ); - } - else - { - msg_Dbg( p_access, "setting filter on PAT" ); - FilterSet( p_access, 0x0, OTHER_TYPE ); - } + scan_parameter_t parameter; + scan_t *p_scan; - E_(CAMOpen)( p_access ); + msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" ); + FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT + FilterSet( p_access, 0x10, OTHER_TYPE ); // NIT + FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT - if( p_sys->b_budget_mode ) - p_sys->i_read_once = DVB_READ_ONCE; - else - p_sys->i_read_once = DVB_READ_ONCE_START; + if( FrontendGetScanParameter( p_access, ¶meter ) || + (p_scan = scan_New( VLC_OBJECT(p_access), ¶meter )) == NULL ) + { + Close( VLC_OBJECT(p_access) ); + return VLC_EGENERIC; + } + p_sys->scan = p_scan; + p_sys->i_read_once = DVB_READ_ONCE_SCAN; + } + + /* Set up access */ + free( p_access->psz_demux ); + p_access->psz_demux = strdup( "m3u8" ); + p_access->pf_read = NULL; + p_access->pf_control = Control; + p_access->pf_seek = NULL; + access_InitFields( p_access ); return VLC_SUCCESS; } @@ -314,93 +205,175 @@ static void Close( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys = p_access->p_sys; - FilterUnset( p_access, p_sys->b_budget_mode ? 1 : MAX_DEMUX ); + FilterUnset( p_access, MAX_DEMUX ); - E_(DVRClose)( p_access ); - E_(FrontendClose)( p_access ); - E_(CAMClose)( p_access ); + DVRClose( p_access ); + FrontendClose( p_access ); + scan_Destroy( p_sys->scan ); free( p_sys ); } /***************************************************************************** - * Block: + * BlockScan: *****************************************************************************/ -static block_t *Block( access_t *p_access ) +static block_t *BlockScan( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; - block_t *p_block; + scan_t *p_scan = p_sys->scan; + scan_configuration_t cfg; + + /* */ + if( scan_Next( p_scan, &cfg ) ) + { + const bool b_first_eof = !p_access->info.b_eof; + + if( b_first_eof ) + msg_Warn( p_access, "Scanning finished" ); + + /* */ + p_access->info.b_eof = true; + return b_first_eof ? scan_GetM3U( p_scan ) : NULL; + } + + /* */ + scan_session_t *session = scan_session_New( VLC_OBJECT(p_access), &cfg ); + if( session == NULL ) + return NULL; + + /* */ + msg_Dbg( p_access, "Scanning frequency %d", cfg.i_frequency ); + var_SetInteger( p_access, "dvb-frequency", cfg.i_frequency ); + msg_Dbg( p_access, " bandwidth %d", cfg.i_bandwidth ); + var_SetInteger( p_access, "dvb-bandwidth", cfg.i_bandwidth ); + if ( cfg.i_fec ) + { + msg_Dbg( p_access, " FEC %d", cfg.i_fec ); + var_SetInteger( p_access, "dvb-fec", cfg.i_fec ); + } + if ( cfg.c_polarization ) + var_SetInteger( p_access, "dvb-voltage", cfg.c_polarization == 'H' ? 18 : 13 ); + + if ( cfg.i_modulation ) + var_SetInteger( p_access, "dvb-modulation", cfg.i_modulation ); + + if ( cfg.i_symbolrate ) + var_SetInteger( p_access, "dvb-srate", cfg.i_symbolrate ); + + /* Setting frontend parameters for tuning the hardware */ + if( FrontendSet( p_access ) < 0 ) + { + msg_Err( p_access, "Failed to tune the frontend" ); + p_access->info.b_eof = true; + scan_session_Destroy( p_scan, session ); + return NULL; + } + + /* */ + int64_t i_scan_start = mdate(); + + bool b_has_dvb_signal = false; + bool b_has_lock = false; + int i_best_snr = -1; for ( ; ; ) { - struct timeval timeout; - fd_set fds, fde; + struct pollfd ufds[2]; 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; + 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.1 second if nothing happens */ /* Find if some data is available */ - i_ret = select( i_max_handle + 1, &fds, NULL, &fde, &timeout ); + i_ret = poll( ufds, 2, 100 ); - if ( p_access->b_die ) - return NULL; - - if ( i_ret < 0 && errno == EINTR ) - continue; + if( !vlc_object_alive (p_access) || scan_IsCancelled( p_scan ) ) + break; - if ( i_ret < 0 ) + if( i_ret <= 0 ) { - msg_Err( p_access, "select error (%s)", strerror(errno) ); - return NULL; + const mtime_t i_scan_time = mdate() - i_scan_start; + frontend_status_t status; + + FrontendGetStatus( p_access, &status ); + + b_has_dvb_signal |= status.b_has_carrier; + b_has_lock |= status.b_has_lock; + + if( ( !b_has_dvb_signal && i_scan_time > DVB_SCAN_MAX_SIGNAL_TIME ) || + ( !b_has_lock && i_scan_time > DVB_SCAN_MAX_LOCK_TIME ) || + ( i_scan_time > DVB_SCAN_MAX_PROBE_TIME ) ) + { + msg_Dbg( p_access, "timed out scanning current frequency (s=%d l=%d)", b_has_dvb_signal, b_has_lock ); + break; + } } - if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event ) + if( i_ret < 0 ) { - E_(CAMPoll)( p_access ); - p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout; + if( errno == EINTR ) + continue; + + msg_Err( p_access, "poll error: %m" ); + scan_session_Destroy( p_scan, session ); + + p_access->info.b_eof = true; + return NULL; } - if ( FD_ISSET( p_sys->i_frontend_handle, &fde ) ) + if( ufds[1].revents ) { - E_(FrontendPoll)( p_access ); + frontend_statistic_t stat; + + FrontendPoll( p_access ); + + if( !FrontendGetStatistic( p_access, &stat ) ) + { + if( stat.i_snr > i_best_snr ) + i_best_snr = stat.i_snr; + } } if ( p_sys->i_frontend_timeout && mdate() > p_sys->i_frontend_timeout ) { msg_Warn( p_access, "no lock, tuning again" ); - E_(FrontendSet)( p_access ); + FrontendSet( p_access ); } - if ( FD_ISSET( p_sys->i_handle, &fds ) ) + if ( ufds[0].revents ) { - break; - } - } + const int i_read_once = 1; + block_t *p_block = block_New( p_access, i_read_once * TS_PACKET_SIZE ); - 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_Err( p_access, "read failed (%s)", strerror(errno) ); - block_Release( p_block ); - return NULL; + if( ( i_ret = read( p_sys->i_handle, p_block->p_buffer, + i_read_once * TS_PACKET_SIZE ) ) <= 0 ) + { + msg_Warn( p_access, "read failed (%m)" ); + block_Release( p_block ); + continue; + } + p_block->i_buffer = i_ret; + + /* */ + if( scan_session_Push( session, p_block ) ) + { + msg_Dbg( p_access, "finished scanning current frequency" ); + break; + } + } } - if( p_sys->i_read_once < DVB_READ_ONCE ) - p_sys->i_read_once++; + /* */ + if( i_best_snr > 0 ) + scan_service_SetSNR( session, i_best_snr ); - return p_block; + scan_session_Destroy( p_scan, session ); + return NULL; } /***************************************************************************** @@ -408,10 +381,10 @@ static block_t *Block( access_t *p_access ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool, b_bool; - int *pi_int, i_int; + bool *pb_bool; int64_t *pi_64; + double *pf1, *pf2; + frontend_statistic_t stat; switch( i_query ) { @@ -420,18 +393,13 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = DVB_READ_ONCE * TS_PACKET_SIZE; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000; + *pi_64 = DEFAULT_PTS_DELAY; break; /* */ @@ -439,30 +407,24 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_GET_TITLE_INFO: case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: + case ACCESS_GET_CONTENT_TYPE: 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 ) + case ACCESS_GET_SIGNAL: + pf1 = (double*)va_arg( args, double * ); + pf2 = (double*)va_arg( args, double * ); + + *pf1 = *pf2 = 0; + if( !FrontendGetStatistic( p_access, &stat ) ) { - /* 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 ); + *pf1 = (double)stat.i_snr / 65535.0; + *pf2 = (double)stat.i_signal_strenth / 65535.0; } - break; + return VLC_SUCCESS; + case ACCESS_SET_PRIVATE_ID_STATE: 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; - } + return VLC_EGENERIC; default: msg_Warn( p_access, "unimplemented query in control" ); @@ -496,7 +458,7 @@ static void FilterSet( access_t *p_access, int i_pid, int i_type ) return; } - if( E_(DMXSetFilter)( p_access, i_pid, + if( DMXSetFilter( p_access, i_pid, &p_sys->p_demux_handles[i].i_handle, i_type ) ) { msg_Err( p_access, "DMXSetFilter failed" ); @@ -518,23 +480,7 @@ static void FilterUnset( access_t *p_access, int i_max ) { 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; - } - } -} - -static void FilterUnsetPID( access_t *p_access, int i_pid ) -{ - access_sys_t *p_sys = p_access->p_sys; - int i; - - for( i = 0; i < MAX_DEMUX; i++ ) - { - if( p_sys->p_demux_handles[i].i_type && - p_sys->p_demux_handles[i].i_pid == i_pid ) - { - E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle ); + DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle ); p_sys->p_demux_handles[i].i_type = 0; } } @@ -545,8 +491,11 @@ static void FilterUnsetPID( access_t *p_access, int i_pid ) *****************************************************************************/ static void VarInit( access_t *p_access ) { - /* */ - var_Create( p_access, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Destroy( p_access, "dvb-modulation" ); + var_Destroy( p_access, "dvb-fec" ); + var_Destroy( p_access, "dvb-code-rate-hp" ); + var_Destroy( p_access, "dvb-code-rate-lp" ); + var_Destroy( p_access, "dvb-guard" ); /* */ var_Create( p_access, "dvb-adapter", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); @@ -554,37 +503,36 @@ static void VarInit( access_t *p_access ) 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-satellite", VLC_VAR_STRING | 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-fec", VLC_VAR_INTEGER ); 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-lnb-lof1", VLC_VAR_INTEGER ); + var_Create( p_access, "dvb-lnb-lof2", VLC_VAR_INTEGER ); + var_Create( p_access, "dvb-lnb-slof", VLC_VAR_INTEGER ); /* */ - var_Create( p_access, "dvb-modulation", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_access, "dvb-modulation", VLC_VAR_INTEGER ); /* */ - 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-code-rate-hp", VLC_VAR_INTEGER ); + var_Create( p_access, "dvb-code-rate-lp", VLC_VAR_INTEGER ); 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-guard", VLC_VAR_INTEGER ); var_Create( p_access, "dvb-hierarchy", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); } /* */ static int ParseMRL( access_t *p_access ) { - char *psz_dup = strdup( p_access->psz_path ); + char *psz_dup = strdup( p_access->psz_location ); char *psz_parser = psz_dup; - char *psz_next; vlc_value_t val; #define GET_OPTION_INT( option ) \ @@ -603,14 +551,16 @@ static int ParseMRL( access_t *p_access ) var_Set( p_access, "dvb-" option, val ); \ } - /* Test for old syntax */ - strtol( psz_parser, &psz_next, 10 ); - if( psz_next != psz_parser ) - { - msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc " - "-p dvb to see an explanation of the new syntax" ); - free( psz_dup ); - return VLC_EGENERIC; +#define GET_OPTION_STRING( option ) \ + if ( !strncmp( psz_parser, option "=", strlen( option "=" ) ) ) \ + { \ + psz_parser += strlen( option "=" ); \ + val.psz_string = psz_parser; \ + char *p_save; \ + char *tok = strtok_r(val.psz_string, ":", &p_save); \ + val.psz_string[tok - val.psz_string - 1] = 0; \ + var_Set( p_access, "dvb-" option, val ); \ + psz_parser += strlen( val.psz_string ); \ } while( *psz_parser ) @@ -622,6 +572,7 @@ static int ParseMRL( access_t *p_access ) else GET_OPTION_BOOL("probe") else GET_OPTION_BOOL("budget-mode") + else GET_OPTION_STRING("satellite") else GET_OPTION_INT("voltage") else GET_OPTION_BOOL("high-voltage") else GET_OPTION_INT("tone") @@ -670,6 +621,7 @@ static int ParseMRL( access_t *p_access ) } #undef GET_OPTION_INT #undef GET_OPTION_BOOL +#undef GET_OPTION_STRING free( psz_dup ); return VLC_SUCCESS;