Commit 0ade81b0 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

All: string review (refs: #438)

parent e970f05f
...@@ -156,7 +156,7 @@ static int Demux( demux_t *p_demux ) ...@@ -156,7 +156,7 @@ static int Demux( demux_t *p_demux )
ASF_GetGUID( &guid, p_peek ); ASF_GetGUID( &guid, p_peek );
if( ASF_CmpGUID( &guid, &asf_object_header_guid ) ) if( ASF_CmpGUID( &guid, &asf_object_header_guid ) )
{ {
msg_Warn( p_demux, "Found a new ASF header" ); msg_Warn( p_demux, "found a new ASF header" );
/* We end this stream */ /* We end this stream */
DemuxEnd( p_demux ); DemuxEnd( p_demux );
...@@ -366,7 +366,7 @@ static int DemuxPacket( demux_t *p_demux ) ...@@ -366,7 +366,7 @@ static int DemuxPacket( demux_t *p_demux )
i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4; i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2; i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2;
// i_packet_size_left = i_packet_length; // XXX donn�s reellement lu // i_packet_size_left = i_packet_length; // XXX data really read
/* FIXME I have to do that for some file, I don't known why */ /* FIXME I have to do that for some file, I don't known why */
i_packet_size_left = i_data_packet_min; i_packet_size_left = i_data_packet_min;
......
...@@ -407,7 +407,7 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj ) ...@@ -407,7 +407,7 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
for( j = 0; j < p_meta->i_record_entries_count; j++ ) for( j = 0; j < p_meta->i_record_entries_count; j++ )
{ {
asf_metadata_record_t *p_rec = &p_meta->record[j]; asf_metadata_record_t *p_rec = &p_meta->record[j];
if( p_rec->i_type == ASF_METADATA_TYPE_STRING ) if( p_rec->i_type == ASF_METADATA_TYPE_STRING )
msg_Dbg( s, " - %s=%s", msg_Dbg( s, " - %s=%s",
p_rec->psz_name, p_rec->p_data ); p_rec->psz_name, p_rec->p_data );
...@@ -717,7 +717,7 @@ static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj) ...@@ -717,7 +717,7 @@ static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, msg_Dbg( s,
"Read \"content description object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"", "read \"content description object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
p_cd->psz_title, p_cd->psz_title,
p_cd->psz_author, p_cd->psz_author,
p_cd->psz_copyright, p_cd->psz_copyright,
...@@ -779,7 +779,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj) ...@@ -779,7 +779,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, "Read \"language list object\" %d entries", msg_Dbg( s, "read \"language list object\" %d entries",
p_ll->i_language ); p_ll->i_language );
for( i = 0; i < p_ll->i_language; i++ ) for( i = 0; i < p_ll->i_language; i++ )
msg_Dbg( s, " - '%s'", msg_Dbg( s, " - '%s'",
...@@ -820,12 +820,12 @@ static int ASF_ReadObject_stream_bitrate_properties( stream_t *s, ...@@ -820,12 +820,12 @@ static int ASF_ReadObject_stream_bitrate_properties( stream_t *s,
{ {
p_sb->bitrate[i].i_stream_number = GetWLE( &p_data[0] )& 0x7f; p_sb->bitrate[i].i_stream_number = GetWLE( &p_data[0] )& 0x7f;
p_sb->bitrate[i].i_avg_bitrate = GetDWLE( &p_data[2] ); p_sb->bitrate[i].i_avg_bitrate = GetDWLE( &p_data[2] );
p_data += 2+4; p_data += 2+4;
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s,"Read \"stream bitrate properties object\"" ); msg_Dbg( s,"read \"stream bitrate properties object\"" );
for( i = 0; i < p_sb->i_bitrate; i++ ) for( i = 0; i < p_sb->i_bitrate; i++ )
{ {
msg_Dbg( s," - stream=%d bitrate=%d", msg_Dbg( s," - stream=%d bitrate=%d",
...@@ -883,7 +883,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, ...@@ -883,7 +883,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
p_esp->pi_stream_name_language[i] = GetWLE( &p_data[0] ); p_esp->pi_stream_name_language[i] = GetWLE( &p_data[0] );
i_size = GetWLE( &p_data[2] ); i_size = GetWLE( &p_data[2] );
p_data += 2; p_data += 2;
psz = calloc( i_size/2 + 1, sizeof( char ) ); psz = calloc( i_size/2 + 1, sizeof( char ) );
for( i_len = 0; i_len < i_size/2; i_len++ ) for( i_len = 0; i_len < i_size/2; i_len++ )
{ {
...@@ -924,7 +924,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, ...@@ -924,7 +924,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, "Read \"extended stream properties object\":" ); msg_Dbg( s, "read \"extended stream properties object\":" );
msg_Dbg( s, " - start="I64Fd" end="I64Fd, msg_Dbg( s, " - start="I64Fd" end="I64Fd,
p_esp->i_start_time, p_esp->i_end_time ); p_esp->i_start_time, p_esp->i_end_time );
msg_Dbg( s, " - data bitrate=%d buffer=%d initial fullness=%d", msg_Dbg( s, " - data bitrate=%d buffer=%d initial fullness=%d",
...@@ -991,7 +991,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s, ...@@ -991,7 +991,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, "Read \"advanced mutual exclusion object\"" ); msg_Dbg( s, "read \"advanced mutual exclusion object\"" );
for( i = 0; i < p_ae->i_stream_number_count; i++ ) for( i = 0; i < p_ae->i_stream_number_count; i++ )
msg_Dbg( s, " - stream=%d", p_ae->pi_stream_number[i] ); msg_Dbg( s, " - stream=%d", p_ae->pi_stream_number[i] );
#endif #endif
...@@ -1033,7 +1033,7 @@ static int ASF_ReadObject_stream_prioritization( stream_t *s, ...@@ -1033,7 +1033,7 @@ static int ASF_ReadObject_stream_prioritization( stream_t *s,
p_sp->pi_priority_flag[i] = GetWLE( p_data ); p_data += 2; p_sp->pi_priority_flag[i] = GetWLE( p_data ); p_data += 2;
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, "Read \"stream prioritization object\"" ); msg_Dbg( s, "read \"stream prioritization object\"" );
for( i = 0; i < p_sp->i_priority_count; i++ ) for( i = 0; i < p_sp->i_priority_count; i++ )
msg_Dbg( s, " - Stream:%d flags=0x%x", msg_Dbg( s, " - Stream:%d flags=0x%x",
p_sp->pi_priority_stream_number[i], p_sp->pi_priority_stream_number[i],
...@@ -1137,7 +1137,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s, ...@@ -1137,7 +1137,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s,
} }
#ifdef ASF_DEBUG #ifdef ASF_DEBUG
msg_Dbg( s, "Read \"extended content description object\"" ); msg_Dbg( s, "read \"extended content description object\"" );
for( i = 0; i < p_ec->i_count; i++ ) for( i = 0; i < p_ec->i_count; i++ )
msg_Dbg( s, " - '%s' = '%s'", msg_Dbg( s, " - '%s' = '%s'",
p_ec->ppsz_name[i], p_ec->ppsz_name[i],
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
*****************************************************************************/ *****************************************************************************/
#define INTERLEAVE_TEXT N_("Force interleaved method" ) #define INTERLEAVE_TEXT N_("Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method" ) #define INTERLEAVE_LONGTEXT N_( "Force interleaved method." )
#define INDEX_TEXT N_("Force index creation") #define INDEX_TEXT N_("Force index creation")
#define INDEX_LONGTEXT N_( \ #define INDEX_LONGTEXT N_( \
......
...@@ -230,7 +230,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -230,7 +230,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
/* FIXME bitrate */ /* FIXME bitrate */
if( i_query == DEMUX_SET_TIME ) return VLC_EGENERIC; if( i_query == DEMUX_SET_TIME ) return VLC_EGENERIC;
else if( i_query == DEMUX_GET_META ) else if( i_query == DEMUX_GET_META )
{ {
vlc_meta_t **pp_meta = (vlc_meta_t **)va_arg( args, vlc_meta_t** ); vlc_meta_t **pp_meta = (vlc_meta_t **)va_arg( args, vlc_meta_t** );
if( p_demux->p_sys->p_meta ) if( p_demux->p_sys->p_meta )
*pp_meta = vlc_meta_Duplicate( p_demux->p_sys->p_meta ); *pp_meta = vlc_meta_Duplicate( p_demux->p_sys->p_meta );
......
...@@ -191,7 +191,7 @@ static int Activate( vlc_object_t * p_this ) ...@@ -191,7 +191,7 @@ static int Activate( vlc_object_t * p_this )
/* Allocate p_m3u */ /* Allocate p_m3u */
p_demux->p_sys = malloc( sizeof( demux_sys_t ) ); p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
p_demux->p_sys->i_type = i_type; p_demux->p_sys->i_type = i_type;
msg_Dbg( p_this, "Playlist type: %d - %d", i_type, i_type2 ); msg_Dbg( p_this, "playlist type: %d - %d", i_type, i_type2 );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -43,7 +43,7 @@ static void Close( vlc_object_t * ); ...@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
#define FPS_TEXT N_("Frames per Second") #define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("This is the desired frame rate when " \ #define FPS_LONGTEXT N_("This is the desired frame rate when " \
"playing MJPEG from a file. Use 0 (this is the default value) for a " \ "playing MJPEG from a file. Use 0 (this is the default value) for a " \
"live stream (from the camera).") "live stream (from a camera).")
vlc_module_begin(); vlc_module_begin();
set_shortname( "MJPEG"); set_shortname( "MJPEG");
...@@ -236,7 +236,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size ) ...@@ -236,7 +236,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
} }
else else
{ {
msg_Dbg( p_demux, "Discard MIME header: %s", psz_line ); msg_Dbg( p_demux, "discard MIME header: %s", psz_line );
} }
free( psz_line ); free( psz_line );
psz_line = GetLine( p_demux, &i_pos ); psz_line = GetLine( p_demux, &i_pos );
...@@ -408,11 +408,11 @@ static int MjpgDemux( demux_t *p_demux ) ...@@ -408,11 +408,11 @@ static int MjpgDemux( demux_t *p_demux )
i++; i++;
if( i >= p_sys->i_data_peeked ) if( i >= p_sys->i_data_peeked )
{ {
msg_Dbg( p_demux, "Did not find JPEG EOI in %d bytes", msg_Dbg( p_demux, "did not find JPEG EOI in %d bytes",
p_sys->i_data_peeked ); p_sys->i_data_peeked );
if( !Peek( p_demux, VLC_FALSE ) ) if( !Peek( p_demux, VLC_FALSE ) )
{ {
msg_Warn( p_demux, "No more data is available at the moment" ); msg_Warn( p_demux, "no more data is available at the moment" );
return 0; return 0;
} }
} }
...@@ -471,7 +471,7 @@ static int MimeDemux( demux_t *p_demux ) ...@@ -471,7 +471,7 @@ static int MimeDemux( demux_t *p_demux )
if( !Peek( p_demux, VLC_FALSE ) ) if( !Peek( p_demux, VLC_FALSE ) )
{ {
msg_Warn( p_demux, "No more data is available at the " msg_Warn( p_demux, "no more data is available at the "
"moment" ); "moment" );
return 0; return 0;
} }
...@@ -491,7 +491,7 @@ static int MimeDemux( demux_t *p_demux ) ...@@ -491,7 +491,7 @@ static int MimeDemux( demux_t *p_demux )
if( !b_match ) if( !b_match )
{ {
msg_Err( p_demux, "Discard non-JPEG part" ); msg_Err( p_demux, "discard non-JPEG part" );
stream_Read( p_demux->s, NULL, i ); stream_Read( p_demux->s, NULL, i );
return 0; return 0;
} }
......
...@@ -888,7 +888,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -888,7 +888,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return VLC_EGENERIC; return VLC_EGENERIC;
default: default:
msg_Warn( p_demux, "control query unimplemented !!!" ); msg_Warn( p_demux, "control query unimplemented!" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
......
...@@ -211,7 +211,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded ) ...@@ -211,7 +211,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf16 = (unsigned char *)malloc( buf16_size ); buf16 = (unsigned char *)malloc( buf16_size );
if( buf16 == NULL ) if( buf16 == NULL )
{ {
msg_Err( p_demux, "Out of memory" ); msg_Err( p_demux, "out of memory" );
return NULL; return NULL;
} }
...@@ -229,7 +229,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded ) ...@@ -229,7 +229,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf8 = (char *)malloc( buf8_size + 1 ); buf8 = (char *)malloc( buf8_size + 1 );
if( buf8 == NULL ) if( buf8 == NULL )
{ {
msg_Err( p_demux, "Out of memory" ); msg_Err( p_demux, "out of memory" );
free( (void *)buf16 ); free( (void *)buf16 );
return NULL; return NULL;
} }
......
...@@ -84,7 +84,7 @@ int E_(Import_B4S)( vlc_object_t *p_this ) ...@@ -84,7 +84,7 @@ int E_(Import_B4S)( vlc_object_t *p_this )
p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) ); p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
if( p_sys == NULL ) if( p_sys == NULL )
{ {
msg_Err( p_demux, "Out of memory" ); msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
p_sys->b_shout = p_demux->psz_demux && p_sys->b_shout = p_demux->psz_demux &&
......
...@@ -76,7 +76,7 @@ int E_(Import_PLS)( vlc_object_t *p_this ) ...@@ -76,7 +76,7 @@ int E_(Import_PLS)( vlc_object_t *p_this )
p_demux->p_sys = malloc( sizeof(demux_sys_t) ); p_demux->p_sys = malloc( sizeof(demux_sys_t) );
if( p_demux->p_sys == NULL ) if( p_demux->p_sys == NULL )
{ {
msg_Err( p_demux, "Out of memory" ); msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux ); p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
......
...@@ -76,7 +76,7 @@ int E_(Import_podcast)( vlc_object_t *p_this ) ...@@ -76,7 +76,7 @@ int E_(Import_podcast)( vlc_object_t *p_this )
p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) ); p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
if( p_sys == NULL ) if( p_sys == NULL )
{ {
msg_Err( p_demux, "Out of memory" ); msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
p_sys->psz_prefix = E_(FindPrefix)( p_demux ); p_sys->psz_prefix = E_(FindPrefix)( p_demux );
......
...@@ -396,7 +396,7 @@ static block_t *dv_extract_audio( demux_t *p_demux, ...@@ -396,7 +396,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
i_audio_quant = p_buf[4] & 0x07; /* 0 - 16bit, 1 - 12bit */ i_audio_quant = p_buf[4] & 0x07; /* 0 - 16bit, 1 - 12bit */
if( i_audio_quant > 1 ) if( i_audio_quant > 1 )
{ {
msg_Dbg( p_demux, "Unsupported quantization for DV audio"); msg_Dbg( p_demux, "unsupported quantization for DV audio");
return NULL; return NULL;
} }
...@@ -451,7 +451,7 @@ static block_t *dv_extract_audio( demux_t *p_demux, ...@@ -451,7 +451,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
else else
{ {
/* 12bit quantization */ /* 12bit quantization */
lc = ((uint16_t)p_frame[d] << 4) | lc = ((uint16_t)p_frame[d] << 4) |
((uint16_t)p_frame[d+2] >> 4); ((uint16_t)p_frame[d+2] >> 4);
lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc)); lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc));
......
...@@ -337,7 +337,7 @@ static int Demux ( demux_t *p_demux ) ...@@ -337,7 +337,7 @@ static int Demux ( demux_t *p_demux )
playlist_t *p_playlist; playlist_t *p_playlist;
playlist_item_t *p_item; playlist_item_t *p_item;
playlist_item_t *p_child; playlist_item_t *p_child;
char *psz_line; char *psz_line;
p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
...@@ -375,10 +375,10 @@ static int Demux ( demux_t *p_demux ) ...@@ -375,10 +375,10 @@ static int Demux ( demux_t *p_demux )
if( p_sys->psz_server && p_sys->psz_location ) if( p_sys->psz_server && p_sys->psz_location )
{ {
char *temp; char *temp;
asprintf( &temp, "rtsp://" "%s:%i%s", asprintf( &temp, "rtsp://" "%s:%i%s",
p_sys->psz_server, p_sys->i_port > 0 ? p_sys->i_port : 554, p_sys->psz_location ); p_sys->psz_server, p_sys->i_port > 0 ? p_sys->i_port : 554, p_sys->psz_location );
p_sys->psz_uri = strdup( temp ); p_sys->psz_uri = strdup( temp );
free( temp ); free( temp );
} }
...@@ -395,7 +395,7 @@ static int Demux ( demux_t *p_demux ) ...@@ -395,7 +395,7 @@ static int Demux ( demux_t *p_demux )
msg_Err( p_demux, "no URI was found" ); msg_Err( p_demux, "no URI was found" );
return -1; return -1;
} }
asprintf( &temp, "%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE", asprintf( &temp, "%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE",
p_sys->psz_uri, p_sys->i_sid ); p_sys->psz_uri, p_sys->i_sid );
...@@ -424,9 +424,9 @@ static int Demux ( demux_t *p_demux ) ...@@ -424,9 +424,9 @@ static int Demux ( demux_t *p_demux )
if( !p_sys->psz_mcast_ip ) if( !p_sys->psz_mcast_ip )
{ {
char *psz_option; char *psz_option;
asprintf( &psz_option, "rtsp-caching=5000" ); asprintf( &psz_option, "rtsp-caching=5000" );
playlist_ItemAddOption( p_child, psz_option ); playlist_ItemAddOption( p_child, psz_option );
free( psz_option ); free( psz_option );
} }
if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna ) if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna )
{ {
......
...@@ -704,9 +704,9 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle ) ...@@ -704,9 +704,9 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle )
unsigned int i; unsigned int i;
int i_microsecperframe = 40000; /* default to 25 fps */ int i_microsecperframe = 40000; /* default to 25 fps */
if( p_sys->i_microsecperframe > 0 ) if( p_sys->i_microsecperframe > 0 )
i_microsecperframe = p_sys->i_microsecperframe; i_microsecperframe = p_sys->i_microsecperframe;
p_subtitle->i_start = 0; p_subtitle->i_start = 0;
p_subtitle->i_stop = 0; p_subtitle->i_stop = 0;
p_subtitle->psz_text = NULL; p_subtitle->psz_text = NULL;
......
...@@ -82,26 +82,29 @@ static void Close ( vlc_object_t * ); ...@@ -82,26 +82,29 @@ static void Close ( vlc_object_t * );
#define PMT_TEXT N_("Extra PMT") #define PMT_TEXT N_("Extra PMT")
#define PMT_LONGTEXT N_( \ #define PMT_LONGTEXT N_( \
"Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" ) "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." )
#define PID_TEXT N_("Set id of ES to PID") #define PID_TEXT N_("Set id of ES to PID")
#define PID_LONGTEXT N_("set id of es to pid") #define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \
" handled by VLC to the same value as the PID in" \
" the TS stream, instead of 1, 2, 3, etc. Useful to" \
" do \'#duplicate{..., select=\"es=<pid>\"}\'.")
#define TSOUT_TEXT N_("Fast udp streaming") #define TSOUT_TEXT N_("Fast udp streaming")
#define TSOUT_LONGTEXT N_( \ #define TSOUT_LONGTEXT N_( \
"Sends TS to specific ip:port by udp (you must know what you are doing)") "Sends TS to specific ip:port by udp (you must know what you are doing).")
#define MTUOUT_TEXT N_("MTU for out mode") #define MTUOUT_TEXT N_("MTU for out mode")
#define MTUOUT_LONGTEXT N_("MTU for out mode") #define MTUOUT_LONGTEXT N_("MTU for out mode.")
#define CSA_TEXT N_("CSA ck") #define CSA_TEXT N_("CSA ck")
#define CSA_LONGTEXT N_("CSA ck") #define CSA_LONGTEXT N_("Control word for the CSa encryption algorithm")
#define SILENT_TEXT N_("Silent mode") #define SILENT_TEXT N_("Silent mode")
#define SILENT_LONGTEXT N_("do not complain on encrypted PES") #define SILENT_LONGTEXT N_("Do not complain on encrypted PES.")
#define CAPMT_SYSID_TEXT N_("CAPMT System ID") #define CAPMT_SYSID_TEXT N_("CAPMT System ID")
#define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM") #define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.")
#define CPKT_TEXT N_("Packet size in bytes to decrypt") #define CPKT_TEXT N_("Packet size in bytes to decrypt")
#define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \ #define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \
...@@ -109,7 +112,7 @@ static void Close ( vlc_object_t * ); ...@@ -109,7 +112,7 @@ static void Close ( vlc_object_t * );
"decrypting. " ) "decrypting. " )
#define TSDUMP_TEXT N_("Filename of dump") #define TSDUMP_TEXT N_("Filename of dump")
#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in") #define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.")
#define APPEND_TEXT N_("Append") #define APPEND_TEXT N_("Append")
#define APPEND_LONGTEXT N_( \ #define APPEND_LONGTEXT N_( \
...@@ -133,7 +136,7 @@ vlc_module_begin(); ...@@ -133,7 +136,7 @@ vlc_module_begin();
add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT, add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,
MTUOUT_LONGTEXT, VLC_TRUE ); MTUOUT_LONGTEXT, VLC_TRUE );
add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE ); add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE );
add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE ); add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE );
add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE ); add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE );
...@@ -326,7 +329,7 @@ struct demux_sys_t ...@@ -326,7 +329,7 @@ struct demux_sys_t
FILE *p_file; /* filehandle */ FILE *p_file; /* filehandle */
uint64_t i_write; /* bytes written */ uint64_t i_write; /* bytes written */
vlc_bool_t b_file_out; /* dump mode enabled */ vlc_bool_t b_file_out; /* dump mode enabled */
/* */ /* */
vlc_bool_t b_meta; vlc_bool_t b_meta;
}; };
...@@ -832,7 +835,7 @@ static int DemuxFile( demux_t *p_demux ) ...@@ -832,7 +835,7 @@ static int DemuxFile( demux_t *p_demux )
i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize ); i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
if( (i_data <= 0) && (i_data < p_sys->i_packet_size) ) if( (i_data <= 0) && (i_data < p_sys->i_packet_size) )
{ {
msg_Dbg( p_demux, "Error reading malformed packets" ); msg_Dbg( p_demux, "error reading malformed packets" );
return i_data; return i_data;
} }
...@@ -1945,13 +1948,13 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) ...@@ -1945,13 +1948,13 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
byte1 = IODGetByte( &i_data, &p_data ); byte1 = IODGetByte( &i_data, &p_data );
byte2 = IODGetByte( &i_data, &p_data ); byte2 = IODGetByte( &i_data, &p_data );
byte3 = IODGetByte( &i_data, &p_data ); byte3 = IODGetByte( &i_data, &p_data );
if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
{ {
p_iod->i_iod_label_scope = 0x11; p_iod->i_iod_label_scope = 0x11;
p_iod->i_iod_label = byte1; p_iod->i_iod_label = byte1;
i_iod_tag = byte2; i_iod_tag = byte2;
} }
else //correct implementation of the IOD_descriptor else //correct implementation of the IOD_descriptor
{ {
p_iod->i_iod_label_scope = byte1; p_iod->i_iod_label_scope = byte1;
p_iod->i_iod_label = byte2; p_iod->i_iod_label = byte2;
...@@ -2910,7 +2913,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -2910,7 +2913,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
{<