/*****************************************************************************
* bda.c : BDA access module for vlc
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007-2009 the VideoLAN team
*
- * Author: Ken Self <kens@campoz.fslife.co.uk>
+ * Author: Ken Self <kenself(at)optusnet(dot)com(dot)au>
*
* 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
* 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
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "bda.h"
+
#include <vlc_plugin.h>
+
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, true );
- add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
- false );
+ CACHING_LONGTEXT, true )
+ change_safe()
+ add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
+ false )
+ change_safe()
# if defined(WIN32) || defined(WINCE)
add_string( "dvb-network-name", NULL, NULL, NAME_TEXT, NAME_LONGTEXT,
- true );
+ true )
add_string( "dvb-create-name", NULL, NULL, CREATE_TEXT,
- CREATE_LONGTEXT, true );
+ CREATE_LONGTEXT, true )
+ add_integer( "dvb-adapter", -1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
+ true )
# else
- add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
- false );
+ /* dvb-device refers to a frontend within an adapter */
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
- true );
- add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
- add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
- 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 )
# endif
/* DVB-S (satellite) */
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT,
- INVERSION_LONGTEXT, true );
- change_integer_list( i_inversion_list, ppsz_inversion_text, NULL );
+ INVERSION_LONGTEXT, true )
+ change_integer_list( i_inversion_list, ppsz_inversion_text, NULL )
# if defined(WIN32) || defined(WINCE)
add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
- POLARISATION_LONGTEXT, false );
- change_string_list( ppsz_polar_list, ppsz_polar_text, 0 );
+ POLARISATION_LONGTEXT, false )
+ change_string_list( ppsz_polar_list, ppsz_polar_text, 0 )
/* Note: Polaristion H = voltage 18; V = voltage 13; */
add_integer( "dvb-network-id", 0, NULL, NETID_TEXT, NETID_LONGTEXT,
- true );
+ true )
add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT,
- true );
+ true )
add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT,
- ELEVATION_LONGTEXT, true );
+ ELEVATION_LONGTEXT, true )
add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT,
- LONGITUDE_LONGTEXT, true );
+ LONGITUDE_LONGTEXT, true )
add_string( "dvb-range", NULL, NULL, RANGE_TEXT,
- RANGE_LONGTEXT, true );
+ RANGE_LONGTEXT, true )
+ /* dvb-range corresponds to the BDA InputRange parameter which is
+ * used by some drivers to control the diseqc */
# else
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
- true );
+ true )
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
- true );
- add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
- HIGH_VOLTAGE_LONGTEXT, 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,
- true );
- add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true );
+ true )
+ add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true )
# endif
add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
- LNB_LOF1_LONGTEXT, true );
+ LNB_LOF1_LONGTEXT, true )
add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
- LNB_LOF2_LONGTEXT, true );
+ LNB_LOF2_LONGTEXT, true )
add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
- LNB_SLOF_LONGTEXT, true );
+ LNB_SLOF_LONGTEXT, true )
add_integer( "dvb-srate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT,
- false );
+ false )
/* DVB-C (cable) */
add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT,
- MODULATION_LONGTEXT, true );
- change_integer_list( i_mod_list, ppsz_mod_text, NULL );
+ MODULATION_LONGTEXT, true )
+ change_integer_list( i_mod_list, ppsz_mod_text, NULL )
/* ATSC */
add_integer( "dvb-major-channel", 0, NULL, MAJOR_CHANNEL_TEXT,
- MAJOR_CHANNEL_LONGTEXT, true );
+ MAJOR_CHANNEL_LONGTEXT, true )
add_integer( "dvb-minor-channel", 0, NULL, MINOR_CHANNEL_TEXT,
- MINOR_CHANNEL_LONGTEXT, true );
+ MINOR_CHANNEL_LONGTEXT, true )
add_integer( "dvb-physical-channel", 0, NULL, PHYSICAL_CHANNEL_TEXT,
- PHYSICAL_CHANNEL_LONGTEXT, true );
+ PHYSICAL_CHANNEL_LONGTEXT, true )
/* DVB-T (terrestrial) */
add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT,
- CODE_RATE_HP_LONGTEXT, true );
- change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL );
+ CODE_RATE_HP_LONGTEXT, true )
+ change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL )
add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT,
- CODE_RATE_LP_LONGTEXT, true );
- change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL );
+ CODE_RATE_LP_LONGTEXT, true )
+ change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL )
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
- false );
- change_integer_list( i_band_list, ppsz_band_text, NULL );
+ false )
+ change_integer_list( i_band_list, ppsz_band_text, NULL )
+ change_safe()
add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
- change_integer_list( i_guard_list, ppsz_guard_text, NULL );
+ change_integer_list( i_guard_list, ppsz_guard_text, NULL )
add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
- TRANSMISSION_LONGTEXT, true );
- change_integer_list( i_transmission_list, ppsz_transmission_text, NULL );
+ TRANSMISSION_LONGTEXT, true )
+ change_integer_list( i_transmission_list, ppsz_transmission_text, NULL )
add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
- true );
- change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL );
+ true )
+ change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL )
set_capability( "access", 0 )
add_shortcut( "dvb" ) /* Generic name */
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
const char* psz_module = "dvb";
- const int i_param_count = 25;
+ const int i_param_count = 26;
const char* psz_param[] = { "frequency", "bandwidth",
"srate", "azimuth", "elevation", "longitude", "polarisation",
"modulation", "caching", "lnb-lof1", "lnb-lof2", "lnb-slof",
"inversion", "network-id", "code-rate-hp", "code-rate-lp",
"guard", "transmission", "hierarchy", "range", "network-name",
- "create-name", "major-channel", "minor-channel", "physical-channel" };
+ "create-name", "major-channel", "minor-channel", "physical-channel",
+ "adapter" };
const int i_type[] = { VLC_VAR_INTEGER, VLC_VAR_INTEGER,
VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER,
VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER,
VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER,
VLC_VAR_INTEGER, VLC_VAR_STRING, VLC_VAR_STRING, VLC_VAR_STRING,
- VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER };
+ VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER, VLC_VAR_INTEGER };
char psz_full_name[128];
int i_ret;
for( int i = 0; i < i_param_count; i++ )
{
- snprintf( psz_full_name, 128, "%s-%s\0", psz_module,
+ snprintf( psz_full_name, 128, "%s-%s", psz_module,
psz_param[i] );
var_Create( p_access, psz_full_name, i_type[i] | VLC_VAR_DOINHERIT );
}
{
i_ret = dvb_SubmitATSCTuneRequest( p_access );
}
+ if( !strcmp( p_access->psz_access, "dvb" ) )
+ {
+ /* Try to auto detect */
+ if( i_ret )
+ i_ret = dvb_SubmitDVBSTuneRequest( p_access );
+ if( i_ret )
+ i_ret = dvb_SubmitDVBCTuneRequest( p_access );
+ if( i_ret )
+ i_ret = dvb_SubmitDVBTTuneRequest( p_access );
+ if( i_ret )
+ i_ret = dvb_SubmitATSCTuneRequest( p_access );
+ }
- if( i_ret != VLC_SUCCESS )
+ if( !i_ret )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "ts" );
+ }
+ else
+ {
msg_Warn( p_access, "DVB_Open: Unsupported Network %s",
- p_access->psz_access);
+ p_access->psz_access);
+ }
return i_ret;
}
i_token_len = strcspn( psz_parser, ":" );
if( i_token_len <= 0 )
i_token_len = strcspn( ++psz_parser, ":" );
-
+
do
{
psz_token = strndup( psz_parser, i_token_len );
v_value.psz_string = strdup( psz_value );
if( i_type[i_this_param] == VLC_VAR_INTEGER )
v_value.i_int = atol( psz_value );
- snprintf( psz_full_name, 128, "%s-%s\0", psz_module,
+ snprintf( psz_full_name, 128, "%s-%s", psz_module,
psz_param[i_this_param] );
var_Set( p_access, psz_full_name, v_value );
dvb_deleteBDAGraph( p_access );
- vlc_mutex_destroy( &p_sys->lock );
- vlc_cond_destroy( &p_sys->wait );
-
free( p_sys );
}
static int Control( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool, b_bool;
- int *pi_int, i_int;
+ int i_int;
int64_t *pi_64;
switch( i_query )
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
- case ACCESS_GET_MTU: /* 4 */
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
- break;
case ACCESS_GET_PTS_DELAY: /* 5 */
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
+ *pi_64 = (int64_t)var_GetInteger( p_access, "dvb-caching" ) * 1000;
break;
/* */
case ACCESS_GET_TITLE_INFO: /* 6 */
b_bool = (bool)va_arg( args, int );
break;
case ACCESS_SET_PRIVATE_ID_CA: /* 12 -From Demux */
- break;
+ return VLC_EGENERIC;
default:
msg_Warn( p_access,
"DVB_Control: Unimplemented query in control %d", i_query );
*****************************************************************************/
static block_t *Block( access_t *p_access )
{
- block_t *p_block;
- long l_buffer_len;
-
- if( !vlc_object_alive (p_access) )
- return NULL;
-
- l_buffer_len = dvb_GetBufferSize( p_access );
- if( l_buffer_len < 0 )
- {
- p_access->info.b_eof = true;
- return NULL;
- }
-
- p_block = block_New( p_access, l_buffer_len );
- if( dvb_ReadBuffer( p_access, &l_buffer_len, p_block->p_buffer ) < 0 )
- {
- p_access->info.b_eof = true;
- return NULL;
- }
-
- return p_block;
+ return dvb_Pop( p_access );
}
projects / vlc / blobdiff