/*****************************************************************************
* access.c: DVB card input v4l2 only
*****************************************************************************
- * Copyright (C) 1998-2005 the VideoLAN team
+ * Copyright (C) 1998-2010 the VideoLAN team
*
* Authors: Johan Bilien <jobi@via.ecp.fr>
* Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
* Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
+ * David Kaplan <david@2of1.org>
*
* 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
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_input.h>
-#include <vlc_interface.h>
-#include <vlc_dialog.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
#include <sys/types.h>
#include <poll.h>
#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>
-# include <dvbpsi/demux.h>
-# include <dvbpsi/sdt.h>
-#else
-# include "dvbpsi.h"
-# include "descriptor.h"
-# include "tables/pat.h"
-# 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>
-#endif
+# include <dvbpsi/dvbpsi.h>
+# include <dvbpsi/descriptor.h>
+# include <dvbpsi/pat.h>
+# include <dvbpsi/pmt.h>
+# include <dvbpsi/dr.h>
+# include <dvbpsi/psi.h>
+# include <dvbpsi/demux.h>
+# include <dvbpsi/sdt.h>
#include "dvb.h"
+#include "scan.h"
/*****************************************************************************
* Module descriptor
#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].")
-#define VOLTAGE_TEXT N_("LNB voltage")
-#define VOLTAGE_LONGTEXT N_("In Volts [0, 13=vertical, 18=horizontal].")
+#define VOLTAGE_TEXT N_("LNB voltage (V)")
+#define VOLTAGE_LONGTEXT ""
+static const int voltages[] = { 0, 13, 18 };
+static const char *const voltages_text[] = { N_("off"), N_("13 V"), N_("18 V") };
#define HIGH_VOLTAGE_TEXT N_("High LNB voltage")
#define HIGH_VOLTAGE_LONGTEXT N_("Enable high voltage if your cables are " \
/* Cable */
#define MODULATION_TEXT N_("Modulation type")
-#define MODULATION_LONGTEXT N_("Modulation type for front-end device.")
+#define MODULATION_LONGTEXT ""
+static const int modulations[] = {
+ -1, 0, 8, 16, 32, 64, 128, 256 };
+static const char *const modulations_text[] = {
+ N_("QPSK"), N_("Auto (QAM)"), N_("VSB 8"), N_("QAM 16"), N_("QAM 32"),
+ N_("QAM 64"), N_("QAM 128"), N_("QAM 256") };
/* Terrestrial */
#define CODE_RATE_HP_TEXT N_("Terrestrial high priority stream code rate (FEC)")
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
+ add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
CACHING_LONGTEXT, true )
change_safe()
- add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
+ add_integer( "dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT,
false )
- add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
+ add_integer( "dvb-device", 0, DEVICE_TEXT, DEVICE_LONGTEXT,
true )
- add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
+ add_integer( "dvb-frequency", 0, FREQ_TEXT, FREQ_LONGTEXT,
false )
- add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
+ change_safe()
+ add_integer( "dvb-inversion", 2, INVERSION_TEXT, INVERSION_LONGTEXT,
true )
- add_bool( "dvb-probe", true, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
- add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
+ add_bool( "dvb-probe", true, PROBE_TEXT, PROBE_LONGTEXT, true )
+ add_bool( "dvb-budget-mode", false, BUDGET_TEXT, BUDGET_LONGTEXT,
true )
/* DVB-S (satellite) */
- add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
+ add_string( "dvb-satellite", NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT,
+ true )
+ add_integer( "dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT,
true )
- add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
+ add_integer( "dvb-voltage", 13, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
true )
- add_bool( "dvb-high-voltage", false, NULL, HIGH_VOLTAGE_TEXT,
+ change_integer_list( voltages, voltages_text )
+ add_bool( "dvb-high-voltage", false, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, true )
- add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
+ add_integer( "dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT,
true )
- add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true )
- add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
+ add_integer( "dvb-fec", 9, FEC_TEXT, FEC_LONGTEXT, true )
+ add_integer( "dvb-srate", 27500000, SRATE_TEXT, SRATE_LONGTEXT,
false )
- add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
+ add_integer( "dvb-lnb-lof1", 0, LNB_LOF1_TEXT,
LNB_LOF1_LONGTEXT, true )
- add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
+ add_integer( "dvb-lnb-lof2", 0, LNB_LOF2_TEXT,
LNB_LOF2_LONGTEXT, true )
- add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
+ add_integer( "dvb-lnb-slof", 0, LNB_SLOF_TEXT,
LNB_SLOF_LONGTEXT, true )
/* DVB-C (cable) */
- add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
+ add_integer( "dvb-modulation", 0, MODULATION_TEXT,
MODULATION_LONGTEXT, true )
+ change_integer_list( modulations, modulations_text )
/* DVB-T (terrestrial) */
- add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT,
+ add_integer( "dvb-code-rate-hp", 9, CODE_RATE_HP_TEXT,
CODE_RATE_HP_LONGTEXT, true )
- add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT,
+ add_integer( "dvb-code-rate-lp", 9, CODE_RATE_LP_TEXT,
CODE_RATE_LP_LONGTEXT, true )
- add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
+ add_integer( "dvb-bandwidth", 0, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
true )
- add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
- add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT,
+ change_safe()
+ add_integer( "dvb-guard", 0, GUARD_TEXT, GUARD_LONGTEXT, true )
+ add_integer( "dvb-transmission", 0, TRANSMISSION_TEXT,
TRANSMISSION_LONGTEXT, true )
- add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
+ add_integer( "dvb-hierarchy", 0, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
true )
#ifdef ENABLE_HTTPD
/* MMI HTTP interface */
set_section( N_("HTTP server" ), 0 )
- add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT,
+ add_string( "dvb-http-host", NULL, HOST_TEXT, HOST_LONGTEXT,
true )
- add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
+ add_string( "dvb-http-user", NULL, USER_TEXT, USER_LONGTEXT,
true )
- add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
+ add_password( "dvb-http-password", NULL, PASSWORD_TEXT,
PASSWORD_LONGTEXT, true )
- add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
+ add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT,
true )
- add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
+ add_loadfile( "dvb-http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT,
true )
- add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT,
+ add_loadfile( "dvb-http-intf-key", NULL, KEY_TEXT, KEY_LONGTEXT,
true )
- add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT,
+ add_loadfile( "dvb-http-intf-ca", NULL, CA_TEXT, CA_LONGTEXT,
true )
- add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT,
+ add_loadfile( "dvb-http-intf-crl", NULL, CRL_TEXT, CRL_LONGTEXT,
true )
#endif
set_capability( "access", 0 )
- add_shortcut( "dvb" ) /* Generic name */
-
- add_shortcut( "dvb-s" ) /* Satellite */
- add_shortcut( "qpsk" )
- add_shortcut( "satellite" )
-
- add_shortcut( "dvb-c" ) /* Cable */
- add_shortcut( "cable" )
-
- add_shortcut( "dvb-t" ) /* Terrestrial */
- add_shortcut( "terrestrial" )
-
- add_shortcut( "atsc" ) /* Atsc */
+ 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 )
#define DVB_READ_ONCE_SCAN 1
#define TS_PACKET_SIZE 188
-#define DVB_SCAN_MAX_SIGNAL_TIME (300*1000)
+#define DVB_SCAN_MAX_SIGNAL_TIME (1000*1000)
#define DVB_SCAN_MAX_LOCK_TIME (5000*1000)
-#define DVB_SCAN_MAX_PROBE_TIME (30000*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 );
}
/* */
- p_sys->b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0;
- if( p_sys->b_scan_mode )
+ bool b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0;
+ if( b_scan_mode )
{
msg_Dbg( p_access, "DVB scan mode selected" );
p_access->pf_block = BlockScan;
return VLC_EGENERIC;
}
- if( p_sys->b_scan_mode )
+ if( b_scan_mode )
{
scan_parameter_t parameter;
+ scan_t *p_scan;
msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" );
FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT
FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT
if( FrontendGetScanParameter( p_access, ¶meter ) ||
- scan_Init( VLC_OBJECT(p_access), &p_sys->scan, ¶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;
}
else
{
{
msg_Dbg( p_access, "setting filter on all PIDs" );
FilterSet( p_access, 0x2000, OTHER_TYPE );
+ p_sys->i_read_once = DVB_READ_ONCE;
}
else
{
msg_Dbg( p_access, "setting filter on PAT" );
FilterSet( p_access, 0x0, OTHER_TYPE );
+ p_sys->i_read_once = DVB_READ_ONCE_START;
}
CAMOpen( p_access );
#endif
}
- 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;
-
free( p_access->psz_demux );
- p_access->psz_demux = strdup( p_sys->b_scan_mode ? "m3u8" : "ts" );
+ p_access->psz_demux = strdup( p_sys->scan ? "m3u8" : "ts" );
return VLC_SUCCESS;
}
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 && !p_sys->b_scan_mode ? 1 : MAX_DEMUX );
+ FilterUnset( p_access, p_sys->b_budget_mode && !p_sys->scan ? 1 : MAX_DEMUX );
DVRClose( p_access );
FrontendClose( p_access );
- if( p_sys->b_scan_mode )
- scan_Clean( &p_sys->scan );
+ if( p_sys->scan != NULL )
+ scan_Destroy( p_sys->scan );
else
+ {
CAMClose( p_access );
-
#ifdef ENABLE_HTTPD
- if( !p_sys->b_scan_mode )
HTTPClose( p_access );
#endif
+ }
free( p_sys );
}
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_t *p_scan = p_sys->scan;
scan_configuration_t cfg;
scan_session_t session;
/* */
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 );
/* Setting frontend parameters for tuning the hardware */
if( FrontendSet( p_access ) < 0 )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "dvb-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
break;
/* */
return VLC_SUCCESS;
case ACCESS_SET_PRIVATE_ID_STATE:
- if( p_sys->b_scan_mode )
+ if( p_sys->scan )
return VLC_EGENERIC;
i_int = (int)va_arg( args, int ); /* Private data (pid for now)*/
break;
case ACCESS_SET_PRIVATE_ID_CA:
- if( p_sys->b_scan_mode )
+ if( p_sys->scan )
return VLC_EGENERIC;
p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * );
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 );
/* */
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 ) \
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" );
- 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;
+#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 )
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")
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;
}
}
#undef GET_OPTION_INT
#undef GET_OPTION_BOOL
+#undef GET_OPTION_STRING
free( psz_dup );
return VLC_SUCCESS;
projects / vlc / blobdiff