Skip to content

D
dvblast
Commit 42830b6a authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* demux.c: Rebuild the PAT when changing the output configuration... 

* demux.c: Rebuild the PAT when changing the output configuration (DVB->non-DVB). * dvb.c, dvblast.c: New options -O (lock timeout) and -Q (quit timeout).
parent 31a07791
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 17 deletions
demux.c
View file @ 42830b6a
...@@ -329,8 +329,12 @@ void demux_Change( output_t *p_output, const output_config_t *p_config ) ...@@ -329,8 +329,12 @@ void demux_Change( output_t *p_output, const output_config_t *p_config )
bool b_sid_change = i_sid != i_old_sid; bool b_sid_change = i_sid != i_old_sid;
bool b_pid_change = false, b_tsid_change = false; bool b_pid_change = false, b_tsid_change = false;
bool b_dvb_change = !!((p_output->config.i_config ^ p_config->i_config)
& OUTPUT_DVB);
int i; int i;
p_output->config.i_config = p_config->i_config;
if ( p_config->i_tsid != -1 && p_output->config.i_tsid != p_config->i_tsid ) if ( p_config->i_tsid != -1 && p_output->config.i_tsid != p_config->i_tsid )
{ {
p_output->i_tsid = p_config->i_tsid; p_output->i_tsid = p_config->i_tsid;
...@@ -457,14 +461,23 @@ out_change: ...@@ -457,14 +461,23 @@ out_change:
NewPAT( p_output ); NewPAT( p_output );
NewPMT( p_output ); NewPMT( p_output );
} }
else if ( b_tsid_change ) else
{ {
NewSDT( p_output ); if ( b_tsid_change )
NewNIT( p_output ); {
NewPAT( p_output ); NewSDT( p_output );
NewNIT( p_output );
NewPAT( p_output );
}
else if ( b_dvb_change )
{
NewNIT( p_output );
NewPAT( p_output );
}
if ( b_pid_change )
NewPMT( p_output );
} }
else if ( b_pid_change )
NewPMT( p_output );
} }
/***************************************************************************** /*****************************************************************************
......
dvb.c
View file @ 42830b6a
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
/***************************************************************************** /*****************************************************************************
* Local declarations * Local declarations
*****************************************************************************/ *****************************************************************************/
#define FRONTEND_LOCK_TIMEOUT 30000000 /* 30 s */
#define DVR_READ_TIMEOUT 30000000 /* 30 s */ #define DVR_READ_TIMEOUT 30000000 /* 30 s */
#define CA_POLL_PERIOD 100000 /* 100 ms */ #define CA_POLL_PERIOD 100000 /* 100 ms */
#define MAX_READ_ONCE 50 #define MAX_READ_ONCE 50
...@@ -193,6 +192,11 @@ block_t *dvb_Read( mtime_t i_poll_timeout ) ...@@ -193,6 +192,11 @@ block_t *dvb_Read( mtime_t i_poll_timeout )
if ( i_frontend_timeout && i_wallclock > i_frontend_timeout ) if ( i_frontend_timeout && i_wallclock > i_frontend_timeout )
{ {
if ( i_quit_timeout_duration )
{
msg_Err( NULL, "no lock" );
exit(EXIT_STATUS_FRONTEND_TIMEOUT);
}
msg_Warn( NULL, "no lock, tuning again" ); msg_Warn( NULL, "no lock, tuning again" );
FrontendSet(false); FrontendSet(false);
} }
...@@ -360,6 +364,9 @@ static void FrontendPoll( void ) ...@@ -360,6 +364,9 @@ static void FrontendPoll( void )
i_frontend_timeout = 0; i_frontend_timeout = 0;
i_last_packet = i_wallclock; i_last_packet = i_wallclock;
if ( i_quit_timeout_duration && !i_quit_timeout )
i_quit_timeout = i_wallclock + i_quit_timeout_duration;
/* Read some statistics */ /* Read some statistics */
if( ioctl( i_frontend, FE_READ_BER, &i_value ) >= 0 ) if( ioctl( i_frontend, FE_READ_BER, &i_value ) >= 0 )
msg_Dbg( NULL, "- Bit error rate: %d", i_value ); msg_Dbg( NULL, "- Bit error rate: %d", i_value );
...@@ -371,7 +378,7 @@ static void FrontendPoll( void ) ...@@ -371,7 +378,7 @@ static void FrontendPoll( void )
else else
{ {
msg_Dbg( NULL, "frontend has lost lock" ); msg_Dbg( NULL, "frontend has lost lock" );
i_frontend_timeout = i_wallclock + FRONTEND_LOCK_TIMEOUT; i_frontend_timeout = i_wallclock + i_frontend_timeout_duration;
} }
IF_UP( FE_REINIT ) IF_UP( FE_REINIT )
...@@ -911,7 +918,7 @@ static void FrontendSet( bool b_init ) ...@@ -911,7 +918,7 @@ static void FrontendSet( bool b_init )
} }
i_last_status = 0; i_last_status = 0;
i_frontend_timeout = i_wallclock + FRONTEND_LOCK_TIMEOUT; i_frontend_timeout = i_wallclock + i_frontend_timeout_duration;
} }
#else /* !S2API */ #else /* !S2API */
...@@ -1008,7 +1015,7 @@ static void FrontendSet( bool b_init ) ...@@ -1008,7 +1015,7 @@ static void FrontendSet( bool b_init )
} }
i_last_status = 0; i_last_status = 0;
i_frontend_timeout = i_wallclock + FRONTEND_LOCK_TIMEOUT; i_frontend_timeout = i_wallclock + i_frontend_timeout_duration;
} }
#endif /* S2API */ #endif /* S2API */
......
dvblast.c
View file @ 42830b6a
...@@ -74,6 +74,9 @@ int i_fec_lp = 999; ...@@ -74,6 +74,9 @@ int i_fec_lp = 999;
int i_guard = -1; int i_guard = -1;
int i_transmission = -1; int i_transmission = -1;
int i_hierarchy = -1; int i_hierarchy = -1;
mtime_t i_frontend_timeout_duration = DEFAULT_FRONTEND_TIMEOUT;
mtime_t i_quit_timeout = 0;
mtime_t i_quit_timeout_duration = 0;
int b_budget_mode = 0; int b_budget_mode = 0;
int b_random_tsid = 0; int b_random_tsid = 0;
uint16_t i_network_id = 0xffff; uint16_t i_network_id = 0xffff;
...@@ -325,11 +328,9 @@ static void config_ReadFile( char *psz_file ) ...@@ -325,11 +328,9 @@ static void config_ReadFile( char *psz_file )
free( p_output->config.psz_displayname ); free( p_output->config.psz_displayname );
p_output->config.psz_displayname = strdup( config.psz_displayname ); p_output->config.psz_displayname = strdup( config.psz_displayname );
config.i_config |= OUTPUT_VALID | OUTPUT_STILL_PRESENT;
output_Change( p_output, &config ); output_Change( p_output, &config );
demux_Change( p_output, &config ); demux_Change( p_output, &config );
p_output->config.i_config = OUTPUT_VALID | OUTPUT_STILL_PRESENT |
config.i_config;
} }
config_Free( &config ); config_Free( &config );
...@@ -379,10 +380,10 @@ static void DisplayVersion() ...@@ -379,10 +380,10 @@ static void DisplayVersion()
*****************************************************************************/ *****************************************************************************/
void usage() void usage()
{ {
msg_Raw( NULL, "Usage: dvblast [-q] [-c <config file>] [-r <remote socket>] [-t <ttl>] [-o <SSRC IP>] [-i <RT priority>] [-a <adapter>] [-n <frontend number>] [-S <diseqc>] [-f <frequency>|-D [<src host>[:<src port>]@]<src mcast>[:<port>][/<opts>]*|-A <ASI adapter>] [-s <symbol rate>] [-v <0|13|18>] [-p] [-b <bandwidth>] [-I <inversion>] [-F <fec inner>] [-m <modulation] [-R <rolloff>] [-P <pilot>] [-K <fec lp>] [-G <guard interval>] [-H <hierarchy>] [X <transmission>] [-u] [-U] [-L <latency>] [-E <retention>] [-d <dest IP>[<:port>][/<opts>]*] [-C [-e] [-M <network name] [-N <network ID>]] [-T] [-j <system charset>] [-J <DVB charset>]" ); msg_Raw( NULL, "Usage: dvblast [-q] [-c <config file>] [-r <remote socket>] [-t <ttl>] [-o <SSRC IP>] [-i <RT priority>] [-a <adapter>] [-n <frontend number>] [-S <diseqc>] [-f <frequency>|-D [<src host>[:<src port>]@]<src mcast>[:<port>][/<opts>]*|-A <ASI adapter>] [-s <symbol rate>] [-v <0|13|18>] [-p] [-b <bandwidth>] [-I <inversion>] [-F <fec inner>] [-m <modulation] [-R <rolloff>] [-P <pilot>] [-K <fec lp>] [-G <guard interval>] [-H <hierarchy>] [-X <transmission>] [-O <lock timeout>] [-u] [-U] [-L <latency>] [-E <retention>] [-d <dest IP>[<:port>][/<opts>]*] [-C [-e] [-M <network name] [-N <network ID>]] [-T] [-j <system charset>] [-J <DVB charset>] [-Q <quit timeout>]" );
msg_Raw( NULL, "Input:" ); msg_Raw( NULL, "Input:" );
msg_Raw( NULL, " -a --adapter <adapter>" ); msg_Raw( NULL, " -a --adapter read packets from a Linux-DVB adapter (typically 0-n)" );
msg_Raw( NULL, " -A --asi-adapter read packets from an ASI adapter (0-n)" ); msg_Raw( NULL, " -A --asi-adapter read packets from an ASI adapter (0-n)" );
msg_Raw( NULL, " -b --bandwidth frontend bandwith" ); msg_Raw( NULL, " -b --bandwidth frontend bandwith" );
msg_Raw( NULL, " -D --rtp-input read packets from a multicast address instead of a DVB card" ); msg_Raw( NULL, " -D --rtp-input read packets from a multicast address instead of a DVB card" );
...@@ -408,6 +409,7 @@ void usage() ...@@ -408,6 +409,7 @@ void usage()
msg_Raw( NULL, " -S --diseqc satellite number for diseqc (0: no diseqc, 1-4, A or B)" ); msg_Raw( NULL, " -S --diseqc satellite number for diseqc (0: no diseqc, 1-4, A or B)" );
msg_Raw( NULL, " -u --budget-mode turn on budget mode (no hardware PID filtering)" ); msg_Raw( NULL, " -u --budget-mode turn on budget mode (no hardware PID filtering)" );
msg_Raw( NULL, " -v --voltage voltage to apply to the LNB (QPSK)" ); msg_Raw( NULL, " -v --voltage voltage to apply to the LNB (QPSK)" );
msg_Raw( NULL, " -O --lock-timeout timeout for the lock operation (in ms)" );
msg_Raw( NULL, "Output:" ); msg_Raw( NULL, "Output:" );
msg_Raw( NULL, " -c --config-file <config file>" ); msg_Raw( NULL, " -c --config-file <config file>" );
...@@ -429,7 +431,8 @@ void usage() ...@@ -429,7 +431,8 @@ void usage()
msg_Raw( NULL, " -j --system-charset character set used for printing messages (default UTF-8)" ); msg_Raw( NULL, " -j --system-charset character set used for printing messages (default UTF-8)" );
msg_Raw( NULL, " -J --dvb-charset character set used in output DVB tables (default ISO_8859-1)" ); msg_Raw( NULL, " -J --dvb-charset character set used in output DVB tables (default ISO_8859-1)" );
msg_Raw( NULL, " -l --logger use syslog for logging messages instead of stderr" ); msg_Raw( NULL, " -l --logger use syslog for logging messages instead of stderr" );
msg_Raw( NULL, " -q be quiet (less verbosity, repeat or use number for even quieter)" ); msg_Raw( NULL, " -q --quiet be quiet (less verbosity, repeat or use number for even quieter)" );
msg_Raw( NULL, " -Q --quit-timeout when locked, quit after this delay (in ms), or after the first lock timeout" );
msg_Raw( NULL, " -r --remote-socket <remote socket>" ); msg_Raw( NULL, " -r --remote-socket <remote socket>" );
msg_Raw( NULL, " -V --version only display the version" ); msg_Raw( NULL, " -V --version only display the version" );
exit(1); exit(1);
...@@ -477,6 +480,7 @@ int main( int i_argc, char **pp_argv ) ...@@ -477,6 +480,7 @@ int main( int i_argc, char **pp_argv )
{ "guard", required_argument, NULL, 'G' }, { "guard", required_argument, NULL, 'G' },
{ "hierarchy", required_argument, NULL, 'H' }, { "hierarchy", required_argument, NULL, 'H' },
{ "transmission", required_argument, NULL, 'X' }, { "transmission", required_argument, NULL, 'X' },
{ "lock-timeout", required_argument, NULL, 'O' },
{ "budget-mode", no_argument, NULL, 'u' }, { "budget-mode", no_argument, NULL, 'u' },
{ "udp", no_argument, NULL, 'U' }, { "udp", no_argument, NULL, 'U' },
{ "unique-ts-id", no_argument, NULL, 'T' }, { "unique-ts-id", no_argument, NULL, 'T' },
...@@ -492,12 +496,14 @@ int main( int i_argc, char **pp_argv ) ...@@ -492,12 +496,14 @@ int main( int i_argc, char **pp_argv )
{ "system-charset", required_argument, NULL, 'j' }, { "system-charset", required_argument, NULL, 'j' },
{ "dvb-charset", required_argument, NULL, 'J' }, { "dvb-charset", required_argument, NULL, 'J' },
{ "logger", no_argument, NULL, 'l' }, { "logger", no_argument, NULL, 'l' },
{ "quit-timeout", required_argument, NULL, 'Q' },
{ "quiet", no_argument, NULL, 'q' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
while ( (c = getopt_long(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:F:R:s:S:v:pb:I:m:P:K:G:H:X:uUTL:E:d:D:A:lCeM:N:j:J:hV", long_options, NULL)) != -1 ) while ( (c = getopt_long(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:F:R:s:S:v:pb:I:m:P:K:G:H:X:O:uUTL:E:d:D:A:lCeM:N:j:J:Q:hV", long_options, NULL)) != -1 )
{ {
switch ( c ) switch ( c )
{ {
...@@ -624,6 +630,10 @@ int main( int i_argc, char **pp_argv ) ...@@ -624,6 +630,10 @@ int main( int i_argc, char **pp_argv )
i_transmission = strtol( optarg, NULL, 0 ); i_transmission = strtol( optarg, NULL, 0 );
break; break;
case 'O':
i_frontend_timeout_duration = strtoll( optarg, NULL, 0 ) * 1000;
break;
case 'H': case 'H':
i_hierarchy = strtol( optarg, NULL, 0 ); i_hierarchy = strtol( optarg, NULL, 0 );
break; break;
...@@ -710,6 +720,10 @@ int main( int i_argc, char **pp_argv ) ...@@ -710,6 +720,10 @@ int main( int i_argc, char **pp_argv )
b_random_tsid = 1; b_random_tsid = 1;
break; break;
case 'Q':
i_quit_timeout_duration = strtoll( optarg, NULL, 0 ) * 1000;
break;
case 'V': case 'V':
exit(0); exit(0);
break; break;
...@@ -826,6 +840,9 @@ int main( int i_argc, char **pp_argv ) ...@@ -826,6 +840,9 @@ int main( int i_argc, char **pp_argv )
config_ReadFile( psz_conf_file ); config_ReadFile( psz_conf_file );
} }
if ( i_quit_timeout && i_quit_timeout <= i_wallclock )
exit(EXIT_SUCCESS);
p_ts = pf_Read( i_poll_timeout ); p_ts = pf_Read( i_poll_timeout );
if ( p_ts != NULL ) if ( p_ts != NULL )
demux_Run( p_ts ); demux_Run( p_ts );
...@@ -836,4 +853,5 @@ int main( int i_argc, char **pp_argv ) ...@@ -836,4 +853,5 @@ int main( int i_argc, char **pp_argv )
if ( b_enable_syslog ) if ( b_enable_syslog )
msg_Disconnect(); msg_Disconnect();
return EXIT_SUCCESS;
} }
dvblast.h
View file @ 42830b6a
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#define DEFAULT_OUTPUT_LATENCY 200000 /* 200 ms */ #define DEFAULT_OUTPUT_LATENCY 200000 /* 200 ms */
#define DEFAULT_MAX_RETENTION 40000 /* 40 ms */ #define DEFAULT_MAX_RETENTION 40000 /* 40 ms */
#define MAX_EIT_RETENTION 500000 /* 500 ms */ #define MAX_EIT_RETENTION 500000 /* 500 ms */
#define DEFAULT_FRONTEND_TIMEOUT 30000000 /* 30 s */
#define EXIT_STATUS_FRONTEND_TIMEOUT 100
/***************************************************************************** /*****************************************************************************
* Output configuration flags (for output_t -> i_config) - bit values * Output configuration flags (for output_t -> i_config) - bit values
...@@ -148,6 +150,9 @@ extern int i_fec_lp; ...@@ -148,6 +150,9 @@ extern int i_fec_lp;
extern int i_guard; extern int i_guard;
extern int i_transmission; extern int i_transmission;
extern int i_hierarchy; extern int i_hierarchy;
extern mtime_t i_frontend_timeout_duration;
extern mtime_t i_quit_timeout;
extern mtime_t i_quit_timeout_duration;
extern int b_budget_mode; extern int b_budget_mode;
extern int b_random_tsid; extern int b_random_tsid;
extern uint16_t i_network_id; extern uint16_t i_network_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment