X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvb%2Faccess.c;h=62ed53a05cd7db0461c6019a55c06be8844caa9b;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=2115af1efabf6c88c2c4930eb78bfd908658f10a;hpb=36a5efe8b526390e4171ba80184211bacad9b89d;p=vlc diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index 2115af1efa..62ed53a05c 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-2005 the VideoLAN team + * Copyright (C) 1998-2010 the VideoLAN team * * Authors: Johan Bilien * 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,24 +19,33 @@ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, 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_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include #endif -#include #include +#include #include @@ -47,6 +57,8 @@ # include # include # include +# include +# include #else # include "dvbpsi.h" # include "descriptor.h" @@ -54,10 +66,12 @@ # include "tables/pmt.h" # include "descriptors/dr.h" # include "psi.h" +# include "demux.h" +# include "tables/sdt.h" #endif #ifdef ENABLE_HTTPD -# include "vlc_httpd.h" +# include #endif #include "dvb.h" @@ -70,7 +84,7 @@ static void Close( vlc_object_t *p_this ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Default caching value for DVB streams. This " \ + "Caching value for DVB streams. This " \ "value should be set in milliseconds." ) #define ADAPTER_TEXT N_("Adapter card to tune") @@ -92,6 +106,9 @@ static void Close( vlc_object_t *p_this ); #define BUDGET_LONGTEXT N_("This allows you to stream an entire transponder with a \"budget\" card.") /* Satellite */ +#define SATELLITE_TEXT N_("Satellite scanning config") +#define SATELLITE_LONGTEXT N_("filename of config file in share/dvb/dvb-s") + #define SATNO_TEXT N_("Satellite number in the Diseqc system") #define SATNO_LONGTEXT N_("[0=no diseqc, 1-4=satellite number].") @@ -177,90 +194,95 @@ static void Close( vlc_object_t *p_this ); #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_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("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 ); + CACHING_LONGTEXT, true ) + change_safe() add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, - VLC_FALSE ); + 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 ); + true ) + add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT, + false ) + change_safe() 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 ); + true ) + add_bool( "dvb-probe", true, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ) + add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, + true ) /* DVB-S (satellite) */ + add_string( "dvb-satellite", NULL, NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT, + true ) add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT, - VLC_TRUE ); + 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 ); + true ) + add_bool( "dvb-high-voltage", false, NULL, HIGH_VOLTAGE_TEXT, + HIGH_VOLTAGE_LONGTEXT, 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 ); + true ) + add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ) add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, - VLC_FALSE ); + false ) add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, - LNB_LOF1_LONGTEXT, VLC_TRUE ); + LNB_LOF1_LONGTEXT, true ) add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT, - LNB_LOF2_LONGTEXT, VLC_TRUE ); + LNB_LOF2_LONGTEXT, true ) add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, - LNB_SLOF_LONGTEXT, VLC_TRUE ); + LNB_SLOF_LONGTEXT, true ) /* DVB-C (cable) */ add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT, - MODULATION_LONGTEXT, VLC_TRUE ); + MODULATION_LONGTEXT, true ) /* DVB-T (terrestrial) */ add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, - CODE_RATE_HP_LONGTEXT, VLC_TRUE ); + CODE_RATE_HP_LONGTEXT, true ) add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, - CODE_RATE_LP_LONGTEXT, VLC_TRUE ); + CODE_RATE_LP_LONGTEXT, 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 ); + true ) + change_safe() + add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ) add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT, - TRANSMISSION_LONGTEXT, VLC_TRUE ); + TRANSMISSION_LONGTEXT, true ) add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, - VLC_TRUE ); + true ) #ifdef ENABLE_HTTPD /* MMI HTTP interface */ - set_section( N_("HTTP server" ), 0 ); + set_section( N_("HTTP server" ), 0 ) add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, - VLC_TRUE ); + 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 ); + true ) + add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT, + PASSWORD_LONGTEXT, true ) add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT, - VLC_TRUE ); + true ) add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, - VLC_TRUE ); + true ) add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, - VLC_TRUE ); + true ) add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, - VLC_TRUE ); + true ) add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, - VLC_TRUE ); + true ) #endif - 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(); + set_capability( "access", 0 ) + add_shortcut( "dvb", /* Generic name */ + "dvb-s", "qpsk", "satellite", /* Satellite */ + "dvb-c", "cable", /* Cable */ + "dvb-t", "terrestrial", /* Terrestrial */ + "atsc" ) /* Atsc */ + add_shortcut( "usdigital" ) + + set_callbacks( Open, Close ) + +vlc_module_end () /***************************************************************************** @@ -269,10 +291,17 @@ vlc_module_end(); 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 ); @@ -280,7 +309,6 @@ 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 *****************************************************************************/ @@ -298,15 +326,12 @@ static int Open( vlc_object_t *p_this ) 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 ) ); + access_InitFields( p_access ); + + p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; /* Create all variables */ VarInit( p_access ); @@ -319,52 +344,85 @@ static int Open( vlc_object_t *p_this ) } /* Getting frontend info */ - if( E_(FrontendOpen)( p_access) ) + if( FrontendOpen( p_access) ) { free( p_sys ); return VLC_EGENERIC; } - /* Setting frontend parameters for tuning the hardware */ - msg_Dbg( p_access, "trying to tune the frontend..."); - if( E_(FrontendSet)( p_access ) < 0 ) + /* */ + p_sys->b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0; + if( p_sys->b_scan_mode ) { - E_(FrontendClose)( p_access ); - free( p_sys ); - return VLC_EGENERIC; + msg_Dbg( p_access, "DVB scan mode selected" ); + p_access->pf_block = BlockScan; + } + else + { + /* Setting frontend parameters for tuning the hardware */ + msg_Dbg( p_access, "trying to tune the frontend..."); + if( FrontendSet( p_access ) < 0 ) + { + 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 ) + if( p_sys->b_scan_mode ) { - msg_Dbg( p_access, "setting filter on all PIDs" ); - FilterSet( p_access, 0x2000, OTHER_TYPE ); + scan_parameter_t parameter; + + 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( FrontendGetScanParameter( p_access, ¶meter ) || + scan_Init( VLC_OBJECT(p_access), &p_sys->scan, ¶meter ) ) + { + Close( VLC_OBJECT(p_access) ); + return VLC_EGENERIC; + } } else { - msg_Dbg( p_access, "setting filter on PAT" ); - FilterSet( p_access, 0x0, OTHER_TYPE ); - } + 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 ); + } + + CAMOpen( p_access ); - E_(CAMOpen)( p_access ); +#ifdef ENABLE_HTTPD + HTTPOpen( p_access ); +#endif + } - if( p_sys->b_budget_mode ) + if( p_sys->b_scan_mode ) + p_sys->i_read_once = DVB_READ_ONCE_SCAN; + else if( p_sys->b_budget_mode ) p_sys->i_read_once = DVB_READ_ONCE; else p_sys->i_read_once = DVB_READ_ONCE_START; -#ifdef ENABLE_HTTPD - E_(HTTPOpen)( p_access ); -#endif - + free( p_access->psz_demux ); + p_access->psz_demux = strdup( p_sys->b_scan_mode ? "m3u8" : "ts" ); return VLC_SUCCESS; } @@ -376,14 +434,18 @@ 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, p_sys->b_budget_mode && !p_sys->b_scan_mode ? 1 : MAX_DEMUX ); - E_(DVRClose)( p_access ); - E_(FrontendClose)( p_access ); - E_(CAMClose)( p_access ); + DVRClose( p_access ); + FrontendClose( p_access ); + if( p_sys->b_scan_mode ) + scan_Clean( &p_sys->scan ); + else + CAMClose( p_access ); #ifdef ENABLE_HTTPD - E_(HTTPClose)( p_access ); + if( !p_sys->b_scan_mode ) + HTTPClose( p_access ); #endif free( p_sys ); @@ -399,47 +461,41 @@ static block_t *Block( access_t *p_access ) 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; + 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 */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - /* Find if some data is available */ - i_ret = select( i_max_handle + 1, &fds, NULL, &fde, &timeout ); + i_ret = poll( ufds, 2, 500 ); - if ( p_access->b_die ) + if ( !vlc_object_alive (p_access) ) return NULL; - if ( i_ret < 0 && errno == EINTR ) - continue; - if ( i_ret < 0 ) { - msg_Err( p_access, "select error (%s)", strerror(errno) ); + if( errno == EINTR ) + continue; + + msg_Err( p_access, "poll error: %m" ); return NULL; } if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event ) { - E_(CAMPoll)( p_access ); + CAMPoll( p_access ); p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout; } - if ( FD_ISSET( p_sys->i_frontend_handle, &fde ) ) + if ( ufds[1].revents ) { - E_(FrontendPoll)( p_access ); + FrontendPoll( p_access ); } #ifdef ENABLE_HTTPD @@ -449,13 +505,13 @@ static block_t *Block( access_t *p_access ) 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->b_request_frontend_info = 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->b_request_mmi_info = false; p_sys->psz_mmi_info = strdup( "Timeout getting info\n" ); } vlc_cond_signal( &p_sys->httpd_cond ); @@ -464,32 +520,33 @@ static block_t *Block( access_t *p_access ) if ( p_sys->b_request_frontend_info ) { - E_(FrontendStatus)( p_access ); + FrontendStatus( p_access ); } if ( p_sys->b_request_mmi_info ) { - E_(CAMStatus)( p_access ); + CAMStatus( p_access ); } #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 ); + FrontendSet( p_access ); } - if ( FD_ISSET( p_sys->i_handle, &fds ) ) + 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, + if( ( i_ret = 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) ); + msg_Warn( p_access, "read failed (%m)" ); block_Release( p_block ); continue; } + p_block->i_buffer = i_ret; break; } } @@ -497,18 +554,193 @@ static block_t *Block( access_t *p_access ) if( p_sys->i_read_once < DVB_READ_ONCE ) p_sys->i_read_once++; + /* Update moderatly the signal properties */ + if( (p_sys->i_stat_counter++ % 100) == 0 ) + p_access->info.i_update |= INPUT_UPDATE_SIGNAL; + return p_block; } +/***************************************************************************** + * BlockScan: + *****************************************************************************/ +static block_t *BlockScan( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; + scan_t *p_scan = &p_sys->scan; + scan_configuration_t cfg; + scan_session_t session; + + /* set satellite config file path */ + if( p_scan->parameter.type == SCAN_DVB_S ) + p_scan->parameter.sat_info.psz_name = var_GetString( p_access, "dvb-satellite" ); + + /* */ + 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; + } + + /* */ + + if( scan_session_Init( VLC_OBJECT(p_access), &session, &cfg ) ) + return NULL; + + /* */ + if( p_scan->parameter.type == SCAN_DVB_S ) + { + msg_Dbg( p_access, + "Scanning frequency %d, symbol rate = %d, fec = %d", + cfg.i_frequency, + cfg.i_bandwidth, + cfg.i_fec ); + } + else + msg_Dbg( p_access, "Scanning frequency %d, bandwidth = %d", + cfg.i_frequency, + cfg.i_bandwidth ); + + var_SetInteger( p_access, "dvb-frequency", cfg.i_frequency ); + var_SetInteger( p_access, "dvb-bandwidth", cfg.i_bandwidth ); + if ( 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 ); + + /* 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; + 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 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.1 second if nothing happens */ + /* Find if some data is available */ + i_ret = poll( ufds, 2, 100 ); + + if( !vlc_object_alive (p_access) || scan_IsCancelled( p_scan ) ) + break; + + if( i_ret <= 0 ) + { + 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( i_ret < 0 ) + { + if( errno == EINTR ) + continue; + + msg_Err( p_access, "poll error: %m" ); + scan_session_Clean( p_scan, &session ); + + p_access->info.b_eof = true; + return NULL; + } + + if( ufds[1].revents ) + { + 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" ); + FrontendSet( p_access ); + } + + if ( ufds[0].revents ) + { + const int i_read_once = 1; + block_t *p_block = block_New( p_access, i_read_once * TS_PACKET_SIZE ); + + 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( i_best_snr > 0 ) + scan_service_SetSNR( &session, i_best_snr ); + + scan_session_Clean( p_scan, &session ); + return NULL; +} + /***************************************************************************** * Control: *****************************************************************************/ 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, b_bool; + int i_int; int64_t *pi_64; + double *pf1, *pf2; + dvbpsi_pmt_t *p_pmt; + frontend_statistic_t stat; switch( i_query ) { @@ -517,15 +749,10 @@ 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; @@ -536,11 +763,27 @@ 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_GET_SIGNAL: + pf1 = (double*)va_arg( args, double * ); + pf2 = (double*)va_arg( args, double * ); + + *pf1 = *pf2 = 0; + if( !FrontendGetStatistic( p_access, &stat ) ) + { + *pf1 = (double)stat.i_snr / 65535.0; + *pf2 = (double)stat.i_signal_strenth / 65535.0; + } + return VLC_SUCCESS; + case ACCESS_SET_PRIVATE_ID_STATE: + if( p_sys->b_scan_mode ) + return VLC_EGENERIC; + 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 */ + b_bool = (bool)va_arg( args, int ); /* b_selected */ if( !p_sys->b_budget_mode ) { /* FIXME we may want to give the real type (me ?, I don't ;) */ @@ -552,14 +795,13 @@ static int Control( access_t *p_access, int i_query, va_list args ) break; case ACCESS_SET_PRIVATE_ID_CA: - { - dvbpsi_pmt_t *p_pmt; + if( p_sys->b_scan_mode ) + return VLC_EGENERIC; p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * ); - E_(CAMSet)( p_access, p_pmt ); + CAMSet( p_access, p_pmt ); break; - } default: msg_Warn( p_access, "unimplemented query in control" ); @@ -593,7 +835,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" ); @@ -615,7 +857,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 ); + DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle ); p_sys->p_demux_handles[i].i_type = 0; } } @@ -631,7 +873,7 @@ static void FilterUnsetPID( access_t *p_access, int i_pid ) 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; } } @@ -654,6 +896,7 @@ static void VarInit( access_t *p_access ) 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 ); @@ -690,7 +933,7 @@ static void VarInit( access_t *p_access ) /* */ 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; @@ -711,12 +954,27 @@ static int ParseMRL( access_t *p_access ) var_Set( p_access, "dvb-" option, val ); \ } +#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 ); \ + } + /* 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" ); + dialog_FatalWait( p_access, _("Input syntax is deprecated"), "%s", + _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \ + "explanation of the new syntax.") ); free( psz_dup ); return VLC_EGENERIC; } @@ -730,6 +988,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") @@ -761,6 +1020,9 @@ static int ParseMRL( access_t *p_access ) else { msg_Err( p_access, "illegal polarization %c", *psz_parser ); + dialog_Fatal( p_access, _("Invalid polarization"), + _("The provided polarization \"%c\" is not valid."), + *psz_parser ); free( psz_dup ); return VLC_EGENERIC; } @@ -778,6 +1040,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;